Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 30087: Add stubs for TRASH_CanTrashFile and TRASH_TrashFile
by hpoussin＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: hpoussin Date: Sat Nov 3 16:39:55 2007 New Revision: 30087 URL: http://svn.reactos.org/svn/reactos?rev=30087&view=rev Log: Add stubs for TRASH_CanTrashFile and TRASH_TrashFile Modified: trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/shell32_ros.diff trunk/reactos/dll/win32/shell32/shlfileop.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Sat Nov 3 16:39:55 2007 @@ -796,3 +796,16 @@ return TRUE; } +BOOL +TRASH_CanTrashFile(LPCWSTR wszPath) +{ + FIXME("(%s)\n", debugstr_w(wszPath)); + return TRUE; +} + +BOOL +TRASH_TrashFile(LPCWSTR wszPath) +{ + FIXME("(%s)\n", debugstr_w(wszPath)); + return FALSE; +} Modified: trunk/reactos/dll/win32/shell32/shell32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_ros.diff (original) +++ trunk/reactos/dll/win32/shell32/shell32_ros.diff Sat Nov 3 16:39:55 2007 @@ -1235,29 +1235,7 @@ =================================================================== --- shlfileop.c (revision 29513) +++ shlfileop.c (working copy) -@@ -1303,8 +1303,8 @@ - return ERROR_SUCCESS; - - /* Windows also checks only the first item */ -- bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO) -- && TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath); -+ bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO); -+ //&& TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath); - - if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING)) - if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom)) -@@ -1325,8 +1325,10 @@ - if (bTrash) - { - BOOL bDelete; -+#if 0 - if (TRASH_TrashFile(fileEntry->szFullPath)) - continue; -+#endif - - /* Note: Windows silently deletes the file in such a situation, we show a dialog */ - if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING)) -@@ -1696,16 +1698,6 @@ +@@ -1696,16 +1696,6 @@ } /*********************************************************************** @@ -1274,7 +1252,7 @@ * SHPathPrepareForWriteW (SHELL32.@) */ HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path, DWORD flags) -@@ -1767,3 +1759,13 @@ +@@ -1767,3 +1757,13 @@ else return HRESULT_FROM_WIN32(ERROR_DIRECTORY); } Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c Sat Nov 3 16:39:55 2007 @@ -1303,10 +1303,8 @@ return ERROR_SUCCESS; /* Windows also checks only the first item */ - bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO); -#if 0 + bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO) && TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath); -#endif if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING)) if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom)) @@ -1327,10 +1325,8 @@ if (bTrash) { BOOL bDelete; -#if 0 if (TRASH_TrashFile(fileEntry->szFullPath)) continue; -#endif /* Note: Windows silently deletes the file in such a situation, we show a dialog */ if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING))

1 0

[ekohl] 30086: Implement removal of environment variables by removing all environment variables from the registry and re-adding the stored ones.
by ekohl＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: ekohl Date: Sat Nov 3 14:02:31 2007 New Revision: 30086 URL: http://svn.reactos.org/svn/reactos?rev=30086&view=rev Log: Implement removal of environment variables by removing all environment variables from the registry and re-adding the stored ones. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sat Nov 3 14:02:31 2007 @@ -484,7 +484,14 @@ PVARIABLE_DATA VarData; LV_ITEM lvi; INT iItem; - HKEY hk; + HKEY hKey; + DWORD dwValueCount; + DWORD dwMaxValueNameLength; + LPTSTR *aValueArray; + DWORD dwNameLength; + DWORD i; + TCHAR szBuffer[256]; + LPTSTR lpBuffer; memset(&lvi, 0x00, sizeof(lvi)); @@ -504,10 +511,76 @@ REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, - &hk, + &hKey, NULL)) { return; + } + + /* Get the number of values and the maximum value name length */ + if (RegQueryInfoKey(hKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValueCount, + &dwMaxValueNameLength, + NULL, + NULL, + NULL)) + { + RegCloseKey(hKey); + return; + } + + if (dwValueCount > 0) + { + /* Allocate the value array */ + aValueArray = GlobalAlloc(GPTR, dwValueCount * sizeof(LPTSTR)); + if (aValueArray != NULL) + { + /* Get all value names */ + for (i = 0; i < dwValueCount; i++) + { + dwNameLength = 256; + if (!RegEnumValue(hKey, + i, + szBuffer, + &dwNameLength, + NULL, + NULL, + NULL, + NULL)) + { + /* Allocate a value name buffer, fill it and attach it to the array */ + lpBuffer = (LPTSTR)GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); + if (lpBuffer != NULL) + { + _tcscpy(lpBuffer, szBuffer); + aValueArray[i] = lpBuffer; + } + } + } + + /* Delete all values */ + for (i = 0; i < dwValueCount; i++) + { + if (aValueArray[i] != NULL) + { + /* Delete the value*/ + RegDeleteValue(hKey, + aValueArray[i]); + + /* Free the value name */ + GlobalFree(aValueArray[i]); + } + } + + /* Free the value array */ + GlobalFree(aValueArray); + } } /* Loop through all variables */ @@ -518,14 +591,14 @@ if (VarData != NULL) { /* Set the new value */ - if (RegSetValueEx(hk, + if (RegSetValueEx(hKey, VarData->lpName, 0, VarData->dwType, (LPBYTE)VarData->lpRawValue, (DWORD)(_tcslen(VarData->lpRawValue) + 1) * sizeof(TCHAR))) { - RegCloseKey(hk); + RegCloseKey(hKey); return; } } @@ -535,7 +608,7 @@ lvi.iItem = ++iItem; } - RegCloseKey(hk); + RegCloseKey(hKey); }

1 0

[jimtabor] 30085: Fix a stub.
by jimtabor＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: jimtabor Date: Sat Nov 3 04:30:04 2007 New Revision: 30085 URL: http://svn.reactos.org/svn/reactos?rev=30085&view=rev Log: Fix a stub. Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Nov 3 04:30:04 2007 @@ -3347,14 +3347,13 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL NtGdiInit() { - UNIMPLEMENTED; - return FALSE; + return TRUE; } /*

1 0

[cfinck] 30084: - Make "notevil" use the new autogenerated contributors header - Fix indentation in "notevil" - Small changes in the "contributors.rbuild"
by cfinck＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: cfinck Date: Sat Nov 3 03:56:14 2007 New Revision: 30084 URL: http://svn.reactos.org/svn/reactos?rev=30084&view=rev Log: - Make "notevil" use the new autogenerated contributors header - Fix indentation in "notevil" - Small changes in the "contributors.rbuild" Modified: branches/rbuild/reactos/contributors.rbuild branches/rbuild/rosapps/notevil/notevil.c branches/rbuild/rosapps/notevil/notevil.rc Modified: branches/rbuild/reactos/contributors.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/contributors.rbu… ============================================================================== --- branches/rbuild/reactos/contributors.rbuild (original) +++ branches/rbuild/reactos/contributors.rbuild Sat Nov 3 03:56:14 2007 @@ -7,7 +7,7 @@ <contributor firstname="Andrew" lastname="Munger" mail="waxdragon(a)gmail.com" alias="amunger" /> <contributor firstname="Arindam" lastname="Das" /> <contributor firstname="Art" lastname="Yerkes" mail="ayerkes(a)speakeasy.net" alias="arty" /> - <contributor firstname="Ariadne" alias="ariadne" /> + <contributor firstname="Boudewijn" lastname="Dekker" alias="ariadne" /> <contributor firstname="Brandon" lastname="Turner" mail="turnerb7(a)msu.edu" alias="turner" /> <contributor firstname="Brian" lastname="Palmer" mail="brianp(a)sginet.com" alias="bpalmer" /> <contributor firstname="Casper S." lastname="Hornstrup" mail="chorns(a)users.sourceforge.net" alias="chorns" /> @@ -20,7 +20,7 @@ <contributor firstname="Eugene" lastname="Ingerman" mail="geneing(a)myrealbox.com" /> <contributor firstname="Filip" lastname="Navara" mail="xnavara(a)volny.cz" alias="navaraf" /> <contributor firstname="Frederik" lastname="Leemans" /> - <contributor firstname="Ge" lastname="van Geldorp" mail="ge(a)gse.nl" alias="gvg" /> + <contributor firstname="Gé" lastname="van Geldorp" mail="ge(a)gse.nl" alias="gvg" /> <contributor firstname="Ged" lastname="Murphy" mail="gedmurphy(a)reactos.org" alias="gedmurphy" /> <contributor firstname="Gregor" lastname="Brunmar" alias="gbrunmar" /> <contributor firstname="Guido" lastname="de Jong" /> Modified: branches/rbuild/rosapps/notevil/notevil.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/rosapps/notevil/notevil.… ============================================================================== --- branches/rbuild/rosapps/notevil/notevil.c (original) +++ branches/rbuild/rosapps/notevil/notevil.c Sat Nov 3 03:56:14 2007 @@ -31,41 +31,39 @@ #include <stdlib.h> #include <tchar.h> #include "resource.h" +#include "autocontributors.h" LPCTSTR app_name = _TEXT("notevil"); -HANDLE myself; -HANDLE ScreenBuffer; -CONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo; -HANDLE WaitableTimer; +HANDLE myself; +HANDLE ScreenBuffer; +CONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo; +HANDLE WaitableTimer; void WriteStringAt( - LPTSTR lpString, - COORD xy, - WORD wColor - ) -{ - DWORD cWritten = 0; - WORD wLen = lstrlen(lpString); - - if (0 == wLen) - return; - // don't bother writing text when erasing - if( wColor ) - WriteConsoleOutputCharacter( ScreenBuffer, - lpString, - wLen, - xy, - & cWritten - ); - FillConsoleOutputAttribute( - ScreenBuffer, - wColor, - wLen, - xy, - & cWritten - ); + LPTSTR lpString, + COORD xy, + WORD wColor) +{ + DWORD cWritten = 0; + WORD wLen = lstrlen(lpString); + + if (0 == wLen) + return; + // don't bother writing text when erasing + if( wColor ) + WriteConsoleOutputCharacter( ScreenBuffer, + lpString, + wLen, + xy, + &cWritten); + FillConsoleOutputAttribute( + ScreenBuffer, + wColor, + wLen, + xy, + & cWritten); } @@ -73,194 +71,195 @@ void WriteCoord(COORD c) { - COORD xy = {0,0}; - TCHAR buf [40]; - - wsprintf( - buf, - _TEXT("x=%02d y=%02d"), - c.X, - c.Y - ); - WriteStringAt( - buf, - xy, - (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) - ); + COORD xy = {0,0}; + TCHAR buf [40]; + + wsprintf( + buf, + _TEXT("x=%02d y=%02d"), + c.X, + c.Y + ); + WriteStringAt( + buf, + xy, + (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) + ); } #endif /* def DISPLAY_COORD */ INT GetNextString( - LPTSTR Buffer, - INT BufferSize, - DWORD *Index - ) -{ - if (RES_LAST_INDEX == *Index) - { - *Index = RES_FIRST_INDEX; - } - else - { - ++*Index; - } - LoadString( - myself, - *Index, - Buffer, - BufferSize - ); - return 0; + LPTSTR Buffer, + INT BufferSize, + DWORD *Index) +{ + if (RES_LAST_INDEX == *Index) + { + *Index = RES_FIRST_INDEX; + } + else + { + ++*Index; + } + LoadString( + myself, + *Index, + Buffer, + BufferSize); + + return 0; } VOID DisplayTitle(VOID) { - LPTSTR szTitle = _TEXT("ReactOS Coders Console Parade"); - COORD xy; - - xy.X = (ScreenBufferInfo.dwSize.X - lstrlen(szTitle)) / 2; - xy.Y = ScreenBufferInfo.dwSize.Y / 2; - - WriteStringAt( - szTitle, - xy, - (FOREGROUND_GREEN | FOREGROUND_INTENSITY) - ); + LPTSTR szTitle = _TEXT("ReactOS Coders Console Parade"); + COORD xy; + + xy.X = (ScreenBufferInfo.dwSize.X - lstrlen(szTitle)) / 2; + xy.Y = ScreenBufferInfo.dwSize.Y / 2; + + WriteStringAt( + szTitle, + xy, + (FOREGROUND_GREEN | FOREGROUND_INTENSITY)); } #define RES_DELAY_CHANGE 12 -#define RES_BUFFER_SIZE 1024 void MainLoop(void) { - TCHAR NameString [RES_BUFFER_SIZE]; - DWORD NameIndex = 1; - INT NameLength = 0; - COORD xy; - INT n = RES_DELAY_CHANGE; - INT dir_y = 1; - INT dir_x = 1; - WORD wColor = 1; - - xy.X = ScreenBufferInfo.dwSize.X / 2; - xy.Y = ScreenBufferInfo.dwSize.Y / 2; - - for ( ; 1; ++n ) - { - if (n == RES_DELAY_CHANGE) - { - n = GetNextString( - NameString, - RES_BUFFER_SIZE, - & NameIndex - ); - NameLength = lstrlen(NameString); - wColor++; - if ((wColor & 0x000F) == 0) - wColor = 1; - } - if (xy.X == 0) - { - if (dir_x == -1) - dir_x = 1; - } - else if (xy.X >= ScreenBufferInfo.dwSize.X - NameLength - 1) - { - if (dir_x == 1) - dir_x = -1; - } - xy.X += dir_x; - - if (xy.Y == 0) - { - if (dir_y == -1) - dir_y = 1; - } - else if (xy.Y >= ScreenBufferInfo.dwSize.Y - 1) - { - if (dir_y == 1) - dir_y = -1; - } - xy.Y += dir_y; + const char** pstr; + CHAR NameString [64]; + INT NameLength = 0; + COORD xy; + INT n = RES_DELAY_CHANGE; + INT dir_y = 1; + INT dir_x = 1; + WORD wColor = 1; + + xy.X = ScreenBufferInfo.dwSize.X / 2; + xy.Y = ScreenBufferInfo.dwSize.Y / 2; + + pstr = szAutoContributors; + + for ( ; 1; ++n ) + { + if (n == RES_DELAY_CHANGE) + { + n = 0; + + // Get the current name and make an OEM (console) string out of it + CharToOem(*pstr, NameString); + NameLength = lstrlen(NameString); + + // Next color + wColor++; + if ((wColor & 0x000F) == 0) + wColor = 1; + + // Next name + pstr++; + if(!*pstr) + pstr = szAutoContributors; + } + + if (xy.X == 0) + { + if (dir_x == -1) + dir_x = 1; + } + else if (xy.X >= ScreenBufferInfo.dwSize.X - NameLength - 1) + { + if (dir_x == 1) + dir_x = -1; + } + xy.X += dir_x; + + if (xy.Y == 0) + { + if (dir_y == -1) + dir_y = 1; + } + else if (xy.Y >= ScreenBufferInfo.dwSize.Y - 1) + { + if (dir_y == 1) + dir_y = -1; + } + xy.Y += dir_y; #ifdef DISPLAY_COORD - WriteCoord(xy); + WriteCoord(xy); #endif /* def DISPLAY_COORD */ - DisplayTitle(); - WriteStringAt( - NameString, - xy, - wColor - ); - WaitForSingleObject( WaitableTimer, INFINITE ); - WriteStringAt( - NameString, - xy, - 0 - ); - } + DisplayTitle(); + WriteStringAt( + NameString, + xy, + wColor); + WaitForSingleObject( WaitableTimer, INFINITE ); + WriteStringAt( + NameString, + xy, + 0); + } } int -main( - int argc, - char *argv [] - ) -{ - LARGE_INTEGER lint; - DWORD Written; - COORD Coord = { 0, 0 }; - - myself = GetModuleHandle(NULL); - - GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), - &ScreenBufferInfo); - ScreenBufferInfo.dwSize.X = ScreenBufferInfo.srWindow.Right - ScreenBufferInfo.srWindow.Left + 1; - ScreenBufferInfo.dwSize.Y = ScreenBufferInfo.srWindow.Bottom - ScreenBufferInfo.srWindow.Top + 1; - ScreenBuffer = CreateConsoleScreenBuffer( - GENERIC_WRITE, - 0, - NULL, - CONSOLE_TEXTMODE_BUFFER, - NULL - ); - if (INVALID_HANDLE_VALUE == ScreenBuffer) - { - _ftprintf( - stderr, - _TEXT("%s: could not create a new screen buffer\n"), - app_name - ); - return EXIT_FAILURE; - } - // Fill buffer with black background - FillConsoleOutputAttribute( ScreenBuffer, - 0, - ScreenBufferInfo.dwSize.X * ScreenBufferInfo.dwSize.Y, - Coord, - &Written ); - - WaitableTimer = CreateWaitableTimer( NULL, FALSE, NULL ); - if( WaitableTimer == INVALID_HANDLE_VALUE ) - { - printf( "CreateWaitabletimer() failed\n" ); - return 1; - } - lint.QuadPart = -2000000; - if( SetWaitableTimer( WaitableTimer, &lint, 200, NULL, NULL, FALSE ) == FALSE ) - { - printf( "SetWaitableTimer() failed: 0x%lx\n", GetLastError() ); - return 2; - } - SetConsoleActiveScreenBuffer(ScreenBuffer); - MainLoop(); - CloseHandle(ScreenBuffer); - return EXIT_SUCCESS; +main(int argc, + char *argv []) +{ + LARGE_INTEGER lint; + DWORD Written; + COORD Coord = { 0, 0 }; + + myself = GetModuleHandle(NULL); + + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), + &ScreenBufferInfo); + ScreenBufferInfo.dwSize.X = ScreenBufferInfo.srWindow.Right - ScreenBufferInfo.srWindow.Left + 1; + ScreenBufferInfo.dwSize.Y = ScreenBufferInfo.srWindow.Bottom - ScreenBufferInfo.srWindow.Top + 1; + ScreenBuffer = CreateConsoleScreenBuffer( + GENERIC_WRITE, + 0, + NULL, + CONSOLE_TEXTMODE_BUFFER, + NULL); + if (INVALID_HANDLE_VALUE == ScreenBuffer) + { + _ftprintf( + stderr, + _TEXT("%s: could not create a new screen buffer\n"), + app_name); + return EXIT_FAILURE; + } + // Fill buffer with black background + FillConsoleOutputAttribute( ScreenBuffer, + 0, + ScreenBufferInfo.dwSize.X * ScreenBufferInfo.dwSize.Y, + Coord, + &Written ); + + WaitableTimer = CreateWaitableTimer( NULL, FALSE, NULL ); + if( WaitableTimer == INVALID_HANDLE_VALUE ) + { + printf( "CreateWaitabletimer() failed\n" ); + return 1; + } + lint.QuadPart = -2000000; + if( SetWaitableTimer( WaitableTimer, &lint, 200, NULL, NULL, FALSE ) == FALSE ) + { + printf( "SetWaitableTimer() failed: 0x%lx\n", GetLastError() ); + return 2; + } + SetConsoleActiveScreenBuffer(ScreenBuffer); + MainLoop(); + CloseHandle(ScreenBuffer); + + return EXIT_SUCCESS; } Modified: branches/rbuild/rosapps/notevil/notevil.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/rosapps/notevil/notevil.… ============================================================================== --- branches/rbuild/rosapps/notevil/notevil.rc (original) +++ branches/rbuild/rosapps/notevil/notevil.rc Sat Nov 3 03:56:14 2007 @@ -4,86 +4,3 @@ #define REACTOS_STR_INTERNAL_NAME "notevil\0" #define REACTOS_STR_ORIGINAL_FILENAME "notevil.exe\0" #include <reactos/version.rc> - -/* - * String table - * - * Order is the same as in the status report published weekly in - * the "ros-kernel" mailing list by Rex Jolliff. (obsolete) - * - * 20050116.EA: new coders are added scanning the ros-svn mailing - * list, in no particular order. Current order is kept for historical - * reason. - * - * 2006-03-05, frik85: add new coders (in no particular order) - * - */ - -STRINGTABLE MOVEABLE -BEGIN - 1, "Boudewijn Dekker (Ariadne)" - 2, "Robert Bergkvist (FragDance Galore)" - 3, "Arindam Das" - 4, "Boudewijn Dekker" - 5, "Jason Eager" - 6, "Jason Filby" - 7, "Rex Jolliff" - 8, "Eric Kohl" - 9, "Hans Kremer" - 10, "Frederik Leemans" - 11, "Jean Michault" - 12, "Jim Noeth" - 13, "Brian Palmer" - 14, "Matt Pyne" - 15, "Jason Weiler" -END - -STRINGTABLE MOVEABLE -BEGIN - 16, "David Welch" - 17, "Emanuele Aliberti" - 18, "Phillip Susi" - 19, "Paolo Pantaleo" - 20, "Hernan Ochoa" - 21, "Casper Hornstrup" - 22, "Steven Edwards" - 23, "KJK::Hyperion" - 24, "Robert Dickenson" - 25, "Eugene Ingerman" - 26, "Guido de Jong" - 27, "Jurgen van Gael" - 28, "Marty Dill" - 29, "Ge van Geldorp" - 30, "Richard Campbell" -END - -STRINGTABLE MOVEABLE -BEGIN - 31, "Gunnar Andre' Dalsnes" - 32, "Aleksey Bragin" - 33, "Royce Mitchell III" - 34, "Mark Tempel" - 35, "Art Yerkes" - 36, "Martin Fuchs" - 37, "Vizzini" - 38, "Filip Navara" - 39, "Andrew Greenwood" - 40, "Thomas Weidenmueller" - 41, "Jonathan Wilson" - 42, "Alex Ionescu" - 43, "Jim Tabor" - 44, "Magnus Olsen" - 45, "Herve Poussineau" -END - -STRINGTABLE MOVEABLE -BEGIN - 46, "Christoph von Wittich" - 47, "Brandon Turner" - 48, "Ged Murphy" - 49, "Klemens R. Friedl" - 50, "Maarten Bosma" - 51, "Saveliy Tretiakov" -END - -/* EOF */

1 0

[cfinck] 30083: The authors list is actually in ANSI format, not UTF-8
by cfinck＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: cfinck Date: Sat Nov 3 03:30:11 2007 New Revision: 30083 URL: http://svn.reactos.org/svn/reactos?rev=30083&view=rev Log: The authors list is actually in ANSI format, not UTF-8 Modified: branches/rbuild/reactos/dll/win32/shell32/shell32_main.c Modified: branches/rbuild/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/shell32_main.c (original) +++ branches/rbuild/reactos/dll/win32/shell32/shell32_main.c Sat Nov 3 03:30:11 2007 @@ -997,8 +997,8 @@ { WCHAR name[64]; - /* authors list is in utf-8 format */ - MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, name, sizeof(name) / sizeof(WCHAR) ); + /* authors list is in ANSI format */ + MultiByteToWideChar( CP_ACP, 0, *pstr, -1, name, sizeof(name) / sizeof(WCHAR) ); SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, 0, (LPARAM)name ); pstr++; }

1 0

[cfinck] 30082: - Make use of the new automatically generated contributors list in the ShellAbout dialog, show the authors in the list box - Remove the now unneeded "authors.c" file from shell32 - To get this to build, I also needed to merge-in the changed "include/reactos/version.rc" file from r29924 (forgot that in my previous commit) - Fix the indentation of the "creditsgeneratorenerator.cpp" file and add a newline at the end of the autogenerated file to make GCC happy
by cfinck＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: cfinck Date: Sat Nov 3 03:03:48 2007 New Revision: 30082 URL: http://svn.reactos.org/svn/reactos?rev=30082&view=rev Log: - Make use of the new automatically generated contributors list in the ShellAbout dialog, show the authors in the list box - Remove the now unneeded "authors.c" file from shell32 - To get this to build, I also needed to merge-in the changed "include/reactos/version.rc" file from r29924 (forgot that in my previous commit) - Fix the indentation of the "creditsgeneratorenerator.cpp" file and add a newline at the end of the autogenerated file to make GCC happy Removed: branches/rbuild/reactos/dll/win32/shell32/authors.c Modified: branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild branches/rbuild/reactos/dll/win32/shell32/shell32_main.c branches/rbuild/reactos/include/reactos/version.rc branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp Removed: branches/rbuild/reactos/dll/win32/shell32/authors.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/authors.c (original) +++ branches/rbuild/reactos/dll/win32/shell32/authors.c (removed) @@ -1,1 +1,0 @@ -const char * const SHELL_Authors[] = { "Copyright 1993-2007 WINE team", "Copyright 1998-2007 ReactOS Team", 0 }; Modified: branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS ha estat construit per:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS je d¡lem:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS havde ikke været mulig uden hjælp fra disse personer:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc Sat Nov 3 03:03:48 2007 @@ -153,7 +153,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS wurde Ihnen zur Verfügung gestellt von:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS está disponible gracias a:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS:n toi Sinulle:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc Sat Nov 3 03:03:48 2007 @@ -154,7 +154,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS est une réalisation de:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc Sat Nov 3 03:03:48 2007 @@ -154,7 +154,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "A ReactOS készítõi:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS è disponibile grazie a:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS UI Gothic" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS is geschreven door:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc Sat Nov 3 03:03:48 2007 @@ -153,7 +153,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS foi disponibilizado por:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc Sat Nov 3 03:03:48 2007 @@ -153,7 +153,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS disponibilizado por:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ðàçðàáîò÷èêè ReactOS:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS so ustvarili:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS hade inte varit möjligt utan dessa personer:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS'ý size sunan geliþtiriciler:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ðîçðîáíèêè ReactOS:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc Sat Nov 3 03:03:48 2007 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS a estu fwait par:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc Sat Nov 3 03:03:48 2007 @@ -152,7 +152,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 - LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 + LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75, WS_VSCROLL END SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 Modified: branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild (original) +++ branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild Sat Nov 3 03:03:48 2007 @@ -24,7 +24,6 @@ <library>devmgr</library> <library>rtl</library> <library>winspool</library> - <file>authors.c</file> <file>autocomplete.c</file> <file>brsfolder.c</file> <file>changenotify.c</file> Modified: branches/rbuild/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… ============================================================================== --- branches/rbuild/reactos/dll/win32/shell32/shell32_main.c (original) +++ branches/rbuild/reactos/dll/win32/shell32/shell32_main.c Sat Nov 3 03:03:48 2007 @@ -44,6 +44,7 @@ #include "shell32_main.h" #include "version.h" #include "shresdef.h" +#include "autocontributors.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -979,18 +980,26 @@ { case WM_INITDIALOG: { - const char* const *pstr = SHELL_Authors; + const char** pstr; // Add the authors to the list SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, WM_SETREDRAW, FALSE, 0 ); + + // First add the Wine and ReactOS copyrights + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, 0, (LPARAM)L"Copyright 1993-2007 WINE Team"); + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, 0, (LPARAM)L"Copyright 1998-2007 ReactOS Team"); + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, 0, (LPARAM)L""); + + // Now add the authors from the autogenerated list + pstr = szAutoContributors; while (*pstr) { WCHAR name[64]; /* authors list is in utf-8 format */ - MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, name, sizeof(name)/sizeof(WCHAR) ); - SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, (WPARAM)-1, (LPARAM)name ); + MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, name, sizeof(name) / sizeof(WCHAR) ); + SendDlgItemMessageW( hWnd, IDC_SHELL_ABOUT_AUTHORS_LISTBOX, LB_ADDSTRING, 0, (LPARAM)name ); pstr++; } Modified: branches/rbuild/reactos/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/include/reactos/… ============================================================================== --- branches/rbuild/reactos/include/reactos/version.rc (original) +++ branches/rbuild/reactos/include/reactos/version.rc Sat Nov 3 03:03:48 2007 @@ -15,6 +15,13 @@ #include "winver.h" #include "version.h" #include "buildno.h" + +/* Define some defaults (shouldn't be overwritten by applications */ +#define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team\0" +#define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component\0" +#define REACTOS_DEFAULT_STR_INTERNAL_NAME "\0" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-2007 ReactOS Team\0" +#define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System\0" /* Set defaults for everything, unless overridden */ #ifndef REACTOS_FILEVERSION @@ -58,11 +65,11 @@ #endif /* REACTOS_FILESUBTYPE */ #ifndef REACTOS_STR_COMPANY_NAME -#define REACTOS_STR_COMPANY_NAME "ReactOS Development Team\0" +#define REACTOS_STR_COMPANY_NAME REACTOS_DEFAULT_STR_COMPANY_NAME #endif /* REACTOS_STR_COMPANY_NAME */ #ifndef REACTOS_STR_FILE_DESCRIPTION -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS core dll\0" +#define REACTOS_STR_FILE_DESCRIPTION REACTOS_DEFAULT_STR_FILE_DESCRIPTION #endif /* REACTOS_STR_FILE_DESCRIPTION */ #ifndef REACTOS_STR_FILE_VERSION @@ -74,11 +81,11 @@ #endif /* REACTOS_STR_FILE_VERSION */ #ifndef REACTOS_STR_INTERNAL_NAME -#define REACTOS_STR_INTERNAL_NAME "\0" +#define REACTOS_STR_INTERNAL_NAME REACTOS_DEFAULT_STR_INTERNAL_NAME #endif /* REACTOS_STR_INTERNAL_NAME */ #ifndef REACTOS_STR_LEGAL_COPYRIGHT -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2007 ReactOS Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT #endif /* REACTOS_STR_LEGAL_COPYRIGHT */ #ifndef REACTOS_STR_ORIGINAL_FILENAME @@ -86,7 +93,7 @@ #endif /* REACTOS_STR_ORIGINAL_FILENAME */ #ifndef REACTOS_STR_PRODUCT_NAME -#define REACTOS_STR_PRODUCT_NAME "ReactOS Operating System\0" +#define REACTOS_STR_PRODUCT_NAME REACTOS_DEFAULT_STR_PRODUCT_NAME #endif /* REACTOS_STR_PRODUCT_NAME */ #ifndef REACTOS_STR_PRODUCT_VERSION Modified: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cre… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp Sat Nov 3 03:03:48 2007 @@ -23,7 +23,7 @@ CreditsGenerator::CreditsGenerator ( const Project& project ) - : project ( project ) + : project ( project ) { } @@ -41,21 +41,21 @@ void CreditsGenerator::GenerateTxt () { - char* buf; - char* s; + char* buf; + char* s; - buf = (char*) malloc ( 512*1024 ); - if ( buf == NULL ) - throw OutOfMemoryException (); - - s = buf; - s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n"); + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n"); for ( size_t i = 0; i < project.contributors.size (); i++ ) - { + { Contributor& contributor = *project.contributors[i]; - s = s + sprintf ( s, "\t%s %s (%s)\n" , + s = s + sprintf ( s, "\t%s %s (%s)\n" , contributor.firstName.c_str() , contributor.lastName.c_str() , contributor.alias.c_str()); @@ -69,42 +69,42 @@ contributor.city.c_str() , contributor.country.c_str()); } - } + } - FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); - free ( buf ); + free ( buf ); } void CreditsGenerator::GenerateHeader () { - char* buf; - char* s; + char* buf; + char* s; - buf = (char*) malloc ( 512*1024 ); - if ( buf == NULL ) - throw OutOfMemoryException (); - - s = buf; - s = s + sprintf ( s, "/* Auto generated */\n"); - s = s + sprintf ( s, "\n" ); + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "/* Auto generated */\n"); + s = s + sprintf ( s, "\n" ); s = s + sprintf ( s, "const char* szAutoContributors[]= {\n" ); for ( size_t i = 0; i < project.contributors.size (); i++ ) - { + { Contributor& contributor = *project.contributors[i]; - s = s + sprintf ( s, "\t\"%s %s\",\n" , + s = s + sprintf ( s, "\t\"%s %s\",\n" , contributor.firstName.c_str() , contributor.lastName.c_str()); - } + } s = s + sprintf ( s, "\t0\n"); - s = s + sprintf ( s, " };" ); + s = s + sprintf ( s, "};\n" ); - FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "include" + sSep + "reactos" + sSep + "autocontributors.h" ) ); + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "include" + sSep + "reactos" + sSep + "autocontributors.h" ) ); - free ( buf ); + free ( buf ); }

1 0

[mpiulachs] 30081: Implement the autogenerated credits header file (autocontributors.h) in INTERMEDIATE/include/reactos/autocontributors.h together with Colin
by mpiulachs＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: mpiulachs Date: Sat Nov 3 02:19:18 2007 New Revision: 30081 URL: http://svn.reactos.org/svn/reactos?rev=30081&view=rev Log: Implement the autogenerated credits header file (autocontributors.h) in INTERMEDIATE/include/reactos/autocontributors.h together with Colin Modified: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cre… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp Sat Nov 3 02:19:18 2007 @@ -34,6 +34,13 @@ void CreditsGenerator::Generate () { + GenerateTxt (); + GenerateHeader (); +} + +void +CreditsGenerator::GenerateTxt () +{ char* buf; char* s; @@ -69,3 +76,35 @@ free ( buf ); } + +void +CreditsGenerator::GenerateHeader () +{ + char* buf; + char* s; + + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "/* Auto generated */\n"); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "const char* szAutoContributors[]= {\n" ); + + for ( size_t i = 0; i < project.contributors.size (); i++ ) + { + Contributor& contributor = *project.contributors[i]; + + s = s + sprintf ( s, "\t\"%s %s\",\n" , + contributor.firstName.c_str() , + contributor.lastName.c_str()); + } + + s = s + sprintf ( s, "\t0\n"); + s = s + sprintf ( s, " };" ); + + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "include" + sSep + "reactos" + sSep + "autocontributors.h" ) ); + + free ( buf ); +} Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Sat Nov 3 02:19:18 2007 @@ -1182,7 +1182,9 @@ const Project& project; CreditsGenerator ( const Project& project ); ~CreditsGenerator (); - void Generate (); + void Generate(); + void GenerateTxt(); + void GenerateHeader (); private: };

1 0

[cfinck] 30080: Merge-in the shell32 changes from r29799 to r29924 (needed for a later commit in in this branch)
by cfinck＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: cfinck Date: Sat Nov 3 02:17:20 2007 New Revision: 30080 URL: http://svn.reactos.org/svn/reactos?rev=30080&view=rev Log: Merge-in the shell32 changes from r29799 to r29924 (needed for a later commit in in this branch) Added: branches/rbuild/reactos/dll/win32/shell32/extracticon.c - copied unchanged from r29924, trunk/reactos/dll/win32/shell32/extracticon.c branches/rbuild/reactos/dll/win32/shell32/res/bitmaps/ - copied from r29924, trunk/reactos/dll/win32/shell32/res/bitmaps/ branches/rbuild/reactos/dll/win32/shell32/she_ocmenu.c - copied unchanged from r29924, trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: branches/rbuild/reactos/dll/win32/shell32/bitmap_res.rc branches/rbuild/reactos/dll/win32/shell32/folders.c branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild branches/rbuild/reactos/dll/win32/shell32/shell32.rc branches/rbuild/reactos/dll/win32/shell32/shell32.spec branches/rbuild/reactos/dll/win32/shell32/shell32_main.c branches/rbuild/reactos/dll/win32/shell32/shell32_main.h branches/rbuild/reactos/dll/win32/shell32/shelllink.c branches/rbuild/reactos/dll/win32/shell32/shellole.c branches/rbuild/reactos/dll/win32/shell32/shlview.c branches/rbuild/reactos/dll/win32/shell32/shresdef.h branches/rbuild/reactos/dll/win32/shell32/shv_bg_cmenu.c branches/rbuild/reactos/dll/win32/shell32/shv_item_cmenu.c branches/rbuild/reactos/dll/win32/shell32/undocshell.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/rbuild/reactos/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/folders.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3… Modified: branches/rbuild/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/win32/shell3…

1 0

[fireball] 30079: - Move Nt* APIs converted to new CM into config/cmapi.c - Start removing usage of ReactOS Hive Flags and use NT Hive Flags instead. - Add CmpLockRegsitry based on CmpLockRegistryExclusive. - Add new lazy flush implementation based on the old one, but with parallel work support. Not yet in use. - Don't delete a key that's already being deleted. - Update KcbMaxNameLen after a deletion. - Set the DELETE flag in the KCB during a deletion. - Remove the KCB Key hash during a delete.
by fireball＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: fireball Date: Sat Nov 3 02:12:22 2007 New Revision: 30079 URL: http://svn.reactos.org/svn/reactos?rev=30079&view=rev Log: - Move Nt* APIs converted to new CM into config/cmapi.c - Start removing usage of ReactOS Hive Flags and use NT Hive Flags instead. - Add CmpLockRegsitry based on CmpLockRegistryExclusive. - Add new lazy flush implementation based on the old one, but with parallel work support. Not yet in use. - Don't delete a key that's already being deleted. - Update KcbMaxNameLen after a deletion. - Set the DELETE flag in the KCB during a deletion. - Remove the KCB Key hash during a delete. - Implement CmFlushKey (not yet used). Added: trunk/reactos/ntoskrnl/config/cmlazy.c (with props) trunk/reactos/ntoskrnl/config/ntapi.c (with props) Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Sat Nov 3 02:12:22 2007 @@ -382,7 +382,7 @@ CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); CmiSyncHives(); - + LocalDisposition = REG_CREATED_NEW_KEY; SuccessReturn: @@ -422,13 +422,13 @@ PKEY_OBJECT KeyObject; PCMHIVE RegistryHive; KPROCESSOR_MODE PreviousMode; - + PAGED_CODE(); - + DPRINT("NtFlushKey (KeyHandle %lx) called\n", KeyHandle); - + PreviousMode = ExGetPreviousMode(); - + /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, 0, @@ -440,15 +440,15 @@ { return(Status); } - + VERIFY_KEY_OBJECT(KeyObject); - + RegistryHive = (PCMHIVE)KeyObject->KeyControlBlock->KeyHive; - + /* Acquire hive lock */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - + if (IsNoFileHive(RegistryHive)) { Status = STATUS_SUCCESS; @@ -458,15 +458,14 @@ /* Flush non-volatile hive */ Status = CmiFlushRegistryHive(RegistryHive); } - + ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); - + ObDereferenceObject(KeyObject); - + return STATUS_SUCCESS; } - NTSTATUS NTAPI @@ -674,7 +673,7 @@ if (CmiRegistryInitialized == TRUE) return STATUS_ACCESS_DENIED; - + /* Save boot log file */ IopSaveBootLogToFile(); @@ -685,635 +684,4 @@ return Status; } -NTSTATUS -NTAPI -NtDeleteKey(IN HANDLE KeyHandle) -{ - PKEY_OBJECT KeyObject; - NTSTATUS Status; - REG_DELETE_KEY_INFORMATION DeleteKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtDeleteKey(KH 0x%p)\n", KeyHandle); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - DELETE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - DeleteKeyInfo.Object = (PVOID)KeyObject; - Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmDeleteKey(KeyObject->KeyControlBlock); - - /* Remove the keep-alive reference */ - ObDereferenceObject(KeyObject); - if (KeyObject->KeyControlBlock->KeyHive != - KeyObject->KeyControlBlock->ParentKcb->KeyHive) - { - /* Dereference again */ - ObDereferenceObject(KeyObject); - } - - /* Do post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); - } - - /* Dereference the object */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtEnumerateKey(IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtEnumerateKey() KH 0x%x, Index 0x%x, KIC %d, Length %d\n", - KeyHandle, Index, KeyInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_ENUMERATE_SUB_KEYS, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Index = Index; - EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; - EnumerateKeyInfo.Length = Length; - EnumerateKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmEnumerateKey(KeyObject->KeyControlBlock, - Index, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); - } - - /* Dereference and return status */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtEnumerateValueKey(IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", - KeyHandle, Index, KeyValueInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Index = Index; - EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; - EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; - EnumerateValueKeyInfo.Length = Length; - EnumerateValueKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, - &EnumerateValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmEnumerateValueKey(KeyObject->KeyControlBlock, - Index, - KeyValueInformationClass, - KeyValueInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); - } - - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtQueryKey(IN HANDLE KeyHandle, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_QUERY_KEY_INFORMATION QueryKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", - KeyHandle, KeyInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - (KeyInformationClass != - KeyNameInformation) ? - KEY_QUERY_VALUE : 0, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.KeyInformationClass = KeyInformationClass; - QueryKeyInfo.KeyInformation = KeyInformation; - QueryKeyInfo.Length = Length; - QueryKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmQueryKey(KeyObject->KeyControlBlock, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); - } - - /* Dereference and return status */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtQueryValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", - KeyHandle, ValueName, KeyValueInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - QueryValueKeyInfo.Object = (PVOID)KeyObject; - QueryValueKeyInfo.ValueName = ValueName; - QueryValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; - QueryValueKeyInfo.Length = Length; - QueryValueKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmQueryValueKey(KeyObject->KeyControlBlock, - *ValueName, - KeyValueInformationClass, - KeyValueInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); - } - - DPRINT("NtQueryValueKey() returning 0x%08X\n", Status); - - /* Dereference and return status */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtSetValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN ULONG TitleIndex, - IN ULONG Type, - IN PVOID Data, - IN ULONG DataSize) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtSetValueKey() KH 0x%x, VN '%wZ', TI %x, T %d, DS %d\n", - KeyHandle, ValueName, TitleIndex, Type, DataSize); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_SET_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObReferenceObjectByHandle() failed with Status = 0x%08X\n", Status); - return Status; - } - - /* Setup callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - SetValueKeyInfo.Object = (PVOID)KeyObject; - SetValueKeyInfo.ValueName = ValueName; - SetValueKeyInfo.TitleIndex = TitleIndex; - SetValueKeyInfo.Type = Type; - SetValueKeyInfo.Data = Data; - SetValueKeyInfo.DataSize = DataSize; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmSetValueKey(KeyObject->KeyControlBlock, - ValueName, - Type, - Data, - DataSize); - } - - /* Do the post-callback and de-reference the key object */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - - /* Synchronize the hives and return */ - CmiSyncHives(); - return Status; -} - -NTSTATUS -NTAPI -NtDeleteValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName) -{ - PKEY_OBJECT KeyObject; - NTSTATUS Status; - REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PAGED_CODE(); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_SET_VALUE, - CmpKeyObjectType, - PreviousMode, - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); - return Status; - } - - /* Do the callback */ - DeleteValueKeyInfo.Object = (PVOID)KeyObject; - DeleteValueKeyInfo.ValueName = ValueName; - Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, - &DeleteValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmDeleteValueKey(KeyObject->KeyControlBlock, *ValueName); - - /* Do the post callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, - &PostOperationInfo); - } - - /* Dereference the key body and synchronize the hives */ - ObDereferenceObject(KeyObject); - CmiSyncHives(); - return Status; -} - -NTSTATUS -NTAPI -NtCompactKeys(IN ULONG Count, - IN PHANDLE KeyArray) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtCompressKey(IN HANDLE Key) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtLoadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes) -{ - return NtLoadKey2(KeyObjectAttributes, FileObjectAttributes, 0); -} - -NTSTATUS -NTAPI -NtLoadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, - IN POBJECT_ATTRIBUTES SourceFile, - IN ULONG Flags, - IN HANDLE TrustClassKey, - IN HANDLE Event, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE RootHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtLockProductActivationKeys(IN PULONG pPrivateVer, - IN PULONG pSafeMode) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtLockRegistryKey(IN HANDLE KeyHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtNotifyChangeMultipleKeys(IN HANDLE MasterKeyHandle, - IN ULONG Count, - IN POBJECT_ATTRIBUTES SlaveObjects, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN Asynchronous) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtNotifyChangeKey(IN HANDLE KeyHandle, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN Asynchronous) -{ - return NtNotifyChangeMultipleKeys(KeyHandle, - 0, - NULL, - Event, - ApcRoutine, - ApcContext, - IoStatusBlock, - CompletionFilter, - WatchTree, - Buffer, - Length, - Asynchronous); -} - -NTSTATUS -NTAPI -NtQueryMultipleValueKey(IN HANDLE KeyHandle, - IN OUT PKEY_VALUE_ENTRY ValueList, - IN ULONG NumberOfValues, - OUT PVOID Buffer, - IN OUT PULONG Length, - OUT PULONG ReturnLength) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtQueryOpenSubKeys(IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG HandleCount) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtQueryOpenSubKeysEx(IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG BufferLength, - IN PVOID Buffer, - IN PULONG RequiredSize) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtReplaceKey(IN POBJECT_ATTRIBUTES ObjectAttributes, - IN HANDLE Key, - IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtRestoreKey(IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG RestoreFlags) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSaveKey(IN HANDLE KeyHandle, - IN HANDLE FileHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSaveKeyEx(IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG Flags) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSaveMergedKeys(IN HANDLE HighPrecedenceKeyHandle, - IN HANDLE LowPrecedenceKeyHandle, - IN HANDLE FileHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtSetInformationKey(IN HANDLE KeyHandle, - IN KEY_SET_INFORMATION_CLASS KeyInformationClass, - IN PVOID KeyInformation, - IN ULONG KeyInformationLength) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtUnloadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, - IN ULONG Flags) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtUnloadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, - IN HANDLE Event) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat Nov 3 02:12:22 2007 @@ -36,7 +36,7 @@ if (Flags & ~REG_NO_LAZY_FLUSH) return STATUS_INVALID_PARAMETER; Status = CmpInitHiveFromFile(FileName, - (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0, + (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NOLAZYFLUSH : 0, &Hive, &Allocate, 0); @@ -72,7 +72,7 @@ NTSTATUS Status; ULONG Disposition; - ASSERT(!IsNoFileHive(RegistryHive)); + ASSERT(!RegistryHive->Hive.HiveFlags & HIVE_VOLATILE); if (RtlFindSetBits(&RegistryHive->Hive.DirtyVector, 1, 0) == ~0) { Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Sat Nov 3 02:12:22 2007 @@ -535,6 +535,7 @@ } VOID +NTAPI CmShutdownRegistry(VOID) { PCMHIVE Hive; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sat Nov 3 02:12:22 2007 @@ -502,7 +502,6 @@ #define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" #define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" #define REG_HARDWARE_KEY_NAME L"\\Registry\\Machine\\HARDWARE" -#define IsNoFileHive(Hive) ((Hive)->Flags & HIVE_NO_FILE) typedef struct _KEY_OBJECT { ULONG Type; @@ -515,16 +514,9 @@ } KEY_OBJECT, *PKEY_OBJECT; extern PCMHIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead, CmiConnectedHiveList; -extern KTIMER CmiWorkerTimer; -VOID NTAPI CmiWorkerThread(IN PVOID Param); PVOID NTAPI CmpRosGetHardwareHive(OUT PULONG Length); NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); -ULONG CmiGetMaxNameLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); -ULONG CmiGetMaxClassLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); -ULONG CmiGetMaxValueNameLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); -ULONG CmiGetMaxValueDataLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); VOID CmiSyncHives(VOID); -#define HIVE_NO_FILE 0x00000002 /////////////////////////////////////////////////////////////////////////////// // @@ -785,6 +777,12 @@ VOID NTAPI +CmpLockRegistry( + VOID +); + +VOID +NTAPI CmpUnlockRegistry( VOID ); @@ -855,6 +853,12 @@ VOID NTAPI +CmpRemoveKeyControlBlock( + IN PCM_KEY_CONTROL_BLOCK Kcb +); + +VOID +NTAPI CmpCleanUpKcbCacheWithLock( IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively @@ -957,8 +961,26 @@ // BOOLEAN NTAPI -CmpFlushEntireRegistry( +CmpDoFlushAll( IN BOOLEAN ForceFlush +); + +VOID +NTAPI +CmpShutdownWorkers( + VOID +); + +VOID +NTAPI +CmpCmdInit( + IN BOOLEAN SetupBoot +); + +VOID +NTAPI +CmpLazyFlush( + VOID ); // @@ -1267,6 +1289,13 @@ NTAPI CmDeleteKey( IN PCM_KEY_CONTROL_BLOCK Kcb +); + +NTSTATUS +NTAPI +CmFlushKey( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN EclusiveLock ); NTSTATUS @@ -1326,6 +1355,9 @@ extern BOOLEAN InitIsWinPEMode; extern ULONG CmpHashTableSize; extern ULONG CmpDelayedCloseSize, CmpDelayedCloseIndex; +extern BOOLEAN CmpNoWrite; +extern BOOLEAN CmpForceForceFlush; +extern BOOLEAN CmpWasSetupBoot; // // Inlined functions Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Sat Nov 3 02:12:22 2007 @@ -14,6 +14,59 @@ #include "debug.h" /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +CmpDoFlushAll(IN BOOLEAN ForceFlush) +{ + NTSTATUS Status; + PLIST_ENTRY NextEntry; + PCMHIVE Hive; + BOOLEAN Result = TRUE; + + /* Make sure that the registry isn't read-only now */ + if (CmpNoWrite) return TRUE; + + /* Otherwise, acquire the hive list lock and disable force flush */ + CmpForceForceFlush = FALSE; + ExAcquirePushLockShared(&CmpHiveListHeadLock); + + /* Loop the hive list */ + NextEntry = CmpHiveListHead.Flink; + while (NextEntry != &CmpHiveListHead) + { + /* Get the hive */ + Hive = CONTAINING_RECORD(NextEntry, CMHIVE, HiveList); + if (!(Hive->Hive.HiveFlags & HIVE_NOLAZYFLUSH)) + { + /* Find out why this is needed? [Aleksey] */ + ULONG Disposition; + Status = CmpOpenHiveFiles(&Hive->FileFullPath, + L".LOG", + &Hive->FileHandles[HFILE_TYPE_PRIMARY], + &Hive->FileHandles[HFILE_TYPE_LOG], + &Disposition, + &Disposition, + FALSE, + FALSE, + TRUE, + NULL); + + /* Do the sync */ + DPRINT1("Flushing: %wZ\n", &Hive->FileFullPath); + DPRINT1("Handle: %lx\n", Hive->FileHandles[HFILE_TYPE_PRIMARY]); + Status = HvSyncHive(&Hive->Hive); + if (!NT_SUCCESS(Status)) Result = FALSE; + } + + /* Try the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Release lock and return */ + ExReleasePushLock(&CmpHiveListHeadLock); + return Result; +} NTSTATUS NTAPI @@ -1029,6 +1082,17 @@ Status = STATUS_CANNOT_DELETE; goto Quickie; } + + /* Check if we're already being deleted */ + if (Kcb->Delete) + { + /* Don't do it twice */ + Status = STATUS_SUCCESS; + goto Quickie; + } + + /* Sanity check */ + ASSERT(Node->Flags == Kcb->Flags); /* Check if we don't have any children */ if (!(Node->SubKeyCounts[Stable] + Node->SubKeyCounts[Volatile])) @@ -1042,15 +1106,23 @@ Parent = (PCM_KEY_NODE)HvGetCell(Hive, ParentCell); if (Parent) { + /* Update the maximum name length */ + Kcb->ParentKcb->KcbMaxNameLen = Parent->MaxNameLen; + /* Make sure we're dirty */ ASSERT(HvIsCellDirty(Hive, ParentCell)); /* Update the write time */ KeQuerySystemTime(&Parent->LastWriteTime); + KeQuerySystemTime(&Kcb->ParentKcb->KcbLastWriteTime); /* Release the cell */ HvReleaseCell(Hive, ParentCell); } + + /* Set the KCB in delete mode and remove it */ + Kcb->Delete = TRUE; + CmpRemoveKeyControlBlock(Kcb); /* Clear the cell */ Kcb->KeyCell = HCELL_NIL; @@ -1062,14 +1134,9 @@ Status = STATUS_CANNOT_DELETE; } - /* Make sure we're file-backed */ - if (!(IsNoFileHive((PCMHIVE)Kcb->KeyHive)) || - !(IsNoFileHive((PCMHIVE)Kcb->ParentKcb->KeyHive))) - { - /* Sync up the hives */ - CmiSyncHives(); - } - + /* Flush the registry */ + CmiSyncHives(); + Quickie: /* Release the cell */ HvReleaseCell(Hive, Cell); @@ -1079,3 +1146,36 @@ KeLeaveCriticalRegion(); return Status; } + +NTSTATUS +NTAPI +CmFlushKey(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN EclusiveLock) +{ + PCMHIVE CmHive; + NTSTATUS Status; + PHHIVE Hive; + + /* Get the hives */ + Hive = Kcb->KeyHive; + CmHive = (PCMHIVE)Hive; + + /* Check if this is the master hive */ + if (CmHive == CmiVolatileHive) + { + /* Flush all the hives instead */ + CmpDoFlushAll(FALSE); + } + else + { + /* Flush only this hive */ + if (!HvSyncHive(Hive)) + { + /* Fail */ + Status = STATUS_REGISTRY_IO_FAILED; + } + } + + /* Return the status */ + return Status; +} Added: trunk/reactos/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmlazy.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmlazy.c (added) +++ trunk/reactos/ntoskrnl/config/cmlazy.c Sat Nov 3 02:12:22 2007 @@ -1,0 +1,252 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmapi.c + * PURPOSE: Configuration Manager - Internal Registry APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +KTIMER CmpLazyFlushTimer; +KDPC CmpLazyFlushDpc; +WORK_QUEUE_ITEM CmpLazyWorkItem; +KTIMER CmpEnableLazyFlushTimer; +KDPC CmpEnableLazyFlushDpc; +BOOLEAN CmpLazyFlushPending; +BOOLEAN CmpForceForceFlush; +BOOLEAN CmpHoldLazyFlush = TRUE; +ULONG CmpLazyFlushIntervalInSeconds = 5; +ULONG CmpLazyFlushHiveCount = 7; +ULONG CmpLazyFlushCount = 1; +LONG CmpFlushStarveWriters; + +/* FUNCTIONS ******************************************************************/ + +BOOLEAN +NTAPI +CmpDoFlushNextHive(IN BOOLEAN ForceFlush, + OUT PBOOLEAN Error, + OUT PULONG DirtyCount) +{ + NTSTATUS Status; + PLIST_ENTRY NextEntry; + PCMHIVE CmHive; + BOOLEAN Result; + ULONG HiveCount = CmpLazyFlushHiveCount; + + /* Set Defaults */ + *Error = FALSE; + *DirtyCount = 0; + + /* Don't do anything if we're not supposed to */ + if (CmpNoWrite) return TRUE; + + /* Make sure we have to flush at least one hive */ + if (!HiveCount) HiveCount = 1; + + /* Don't force flush */ + CmpForceForceFlush = FALSE; + + /* Acquire the list lock and loop */ + ExAcquirePushLockShared(&CmpHiveListHeadLock); + NextEntry = CmpHiveListHead.Flink; + while (NextEntry != &CmpHiveListHead) + { + /* Get the hive and check if we should flush it */ + CmHive = CONTAINING_RECORD(NextEntry, CMHIVE, HiveList); + if (!(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH) && + (CmHive->FlushCount != CmpLazyFlushCount)) + { + /* Great sucess! */ + Result = TRUE; + + /* Ignore clean or volatile hves */ + if (!(CmHive->Hive.DirtyCount) || + (CmHive->Hive.HiveFlags & HIVE_VOLATILE)) + { + /* Don't do anything but do update the count */ + CmHive->FlushCount = CmpLazyFlushCount; + } + else + { + /* Do the sync */ + DPRINT1("Flushing: %wZ\n", CmHive->FileFullPath); + DPRINT1("Handle: %lx\n", CmHive->FileHandles[HFILE_TYPE_PRIMARY]); + Status = HvSyncHive(&CmHive->Hive); + if(!NT_SUCCESS(Status)) + { + /* Let them know we failed */ + *Error = TRUE; + Result = FALSE; + } + } + } + else if ((CmHive->Hive.DirtyCount) && + (!(CmHive->Hive.HiveFlags & HIVE_VOLATILE)) && + (!(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH))) + { + /* Use another lazy flusher for this hive */ + ASSERT(CmHive->FlushCount == CmpLazyFlushCount); + *DirtyCount += CmHive->Hive.DirtyCount; + } + + /* Try the next one */ + NextEntry = NextEntry->Flink; + } + + /* Check if we've flushed everything */ + if (NextEntry == &CmpHiveListHead) + { + /* We have, tell the caller we're done */ + Result = FALSE; + } + else + { + /* We need to be called again */ + Result = TRUE; + } + + /* Unlock the list and return the result */ + ExReleasePushLock(&CmpHiveListHeadLock); + return Result; +} + +VOID +NTAPI +CmpEnableLazyFlushDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + /* Don't stop lazy flushing from happening anymore */ + CmpHoldLazyFlush = FALSE; +} + +VOID +NTAPI +CmpLazyFlushDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + /* Check if we should queue the lazy flush worker */ + if ((!CmpLazyFlushPending) && (!CmpHoldLazyFlush)) + { + CmpLazyFlushPending = TRUE; + ExQueueWorkItem(&CmpLazyWorkItem, DelayedWorkQueue); + } +} + +VOID +NTAPI +CmpLazyFlush(VOID) +{ + LARGE_INTEGER DueTime; + PAGED_CODE(); + + /* Check if we should set the lazy flush timer */ + if ((!CmpNoWrite) && (!CmpHoldLazyFlush)) + { + /* Do it */ + DueTime.QuadPart = Int32x32To64(CmpLazyFlushIntervalInSeconds, + -10 * 1000 * 1000); + KeSetTimer(&CmpLazyFlushTimer, DueTime, &CmpLazyFlushDpc); + } +} + +VOID +NTAPI +CmpLazyFlushWorker(IN PVOID Parameter) +{ + BOOLEAN ForceFlush, Result, MoreWork = FALSE; + ULONG DirtyCount = 0; + PAGED_CODE(); + + /* Don't do anything if lazy flushing isn't enabled yet */ + if (CmpHoldLazyFlush) return; + + /* Check if we are forcing a flush */ + ForceFlush = CmpForceForceFlush; + if (ForceFlush) + { + /* Lock the registry exclusively */ + CmpLockRegistryExclusive(); + } + else + { + /* Do a normal lock */ + CmpLockRegistry(); + InterlockedIncrement(&CmpFlushStarveWriters); + } + + /* Flush the next hive */ + MoreWork = CmpDoFlushNextHive(ForceFlush, &Result, &DirtyCount); + if (!MoreWork) + { + /* We're done */ + InterlockedIncrement((PLONG)&CmpLazyFlushCount); + } + + /* Check if we have starved writers */ + if (!ForceFlush) InterlockedDecrement(&CmpFlushStarveWriters); + + /* Not pending anymore, release the registry lock */ + CmpLazyFlushPending = FALSE; + CmpUnlockRegistry(); + + /* Check if we need to flush another hive */ + if ((MoreWork) || (DirtyCount)) CmpLazyFlush(); +} + +VOID +NTAPI +CmpCmdInit(IN BOOLEAN SetupBoot) +{ + LARGE_INTEGER DueTime; + PAGED_CODE(); + + /* Setup the lazy DPC */ + KeInitializeDpc(&CmpLazyFlushDpc, CmpLazyFlushDpcRoutine, NULL); + + /* Setup the lazy timer */ + KeInitializeTimer(&CmpLazyFlushTimer); + + /* Setup the lazy worker */ + ExInitializeWorkItem(&CmpLazyWorkItem, CmpLazyFlushWorker, NULL); + + /* Setup the forced-lazy DPC and timer */ + KeInitializeDpc(&CmpEnableLazyFlushDpc, + CmpEnableLazyFlushDpcRoutine, + NULL); + KeInitializeTimer(&CmpEnableLazyFlushTimer); + + /* Enable lazy flushing after 10 minutes */ + DueTime.QuadPart = Int32x32To64(600, -10 * 1000 * 1000); + KeSetTimer(&CmpEnableLazyFlushTimer, DueTime, &CmpEnableLazyFlushDpc); + + /* Setup flush variables */ + CmpNoWrite = CmpMiniNTBoot; + CmpWasSetupBoot = SetupBoot; + + /* Testing: Force Lazy Flushing */ + CmpHoldLazyFlush = FALSE; +} + +VOID +NTAPI +CmpShutdownWorkers(VOID) +{ + /* Stop lazy flushing */ + PAGED_CODE(); + KeCancelTimer(&CmpLazyFlushTimer); +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/config/cmlazy.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat Nov 3 02:12:22 2007 @@ -23,6 +23,7 @@ BOOLEAN CmpSpecialBootCondition; BOOLEAN CmpNoWrite; BOOLEAN CmpForceForceFlush; +BOOLEAN CmpWasSetupBoot; /* FUNCTIONS *****************************************************************/ @@ -810,7 +811,7 @@ /* Build the master hive */ Status = CmpInitializeHive((PCMHIVE*)&CmiVolatileHive, HINIT_CREATE, - HIVE_VOLATILE | HIVE_NO_FILE, + HIVE_VOLATILE, HFILE_TYPE_PRIMARY, NULL, NULL, @@ -900,7 +901,7 @@ ((PHBASE_BLOCK)BaseAddress)->Length = Length; Status = CmpInitializeHive((PCMHIVE*)&HardwareHive, HINIT_MEMORY, //HINIT_CREATE, - HIVE_NO_FILE, //HIVE_VOLATILE, + HIVE_VOLATILE, HFILE_TYPE_PRIMARY, BaseAddress, // NULL, NULL, @@ -972,6 +973,26 @@ RtlGetCallersAddress(&CmpRegistryLockCaller, &CmpRegistryLockCallerCaller); } +VOID +NTAPI +CmpLockRegistry(VOID) +{ + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Check if we have to starve writers */ + if (CmpFlushStarveWriters) + { + /* Starve exlusive waiters */ + ExAcquireSharedStarveExclusive(&CmpRegistryLock, TRUE); + } + else + { + /* Just grab the lock */ + ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); + } +} + BOOLEAN NTAPI CmpTestRegistryLock(VOID) @@ -1002,7 +1023,7 @@ CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK(); /* Flush the registry */ - CmpFlushEntireRegistry(TRUE); + CmpDoFlushAll(TRUE); CmpFlushOnLockRelease = FALSE; } @@ -1011,27 +1032,11 @@ KeLeaveCriticalRegion(); } -BOOLEAN -NTAPI -CmpFlushEntireRegistry(IN BOOLEAN ForceFlush) -{ - BOOLEAN Flushed = TRUE; - - /* Make sure that the registry isn't read-only now */ - if (CmpNoWrite) return TRUE; - - /* Otherwise, acquire the hive list lock and disable force flush */ - CmpForceForceFlush = FALSE; - ExAcquirePushLockShared(&CmpHiveListHeadLock); - - /* Check if the hive list isn't empty */ - if (!IsListEmpty(&CmpHiveListHead)) - { - /* FIXME: TODO */ - ASSERT(FALSE); - } - - /* Release the lock and return the flush state */ - ExReleasePushLock(&CmpHiveListHeadLock); - return Flushed; -} +VOID +NTAPI +CmShutdownSystem(VOID) +{ + /* Kill the workers and fush all hives */ + CmpShutdownWorkers(); + CmpDoFlushAll(TRUE); +} Added: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (added) +++ trunk/reactos/ntoskrnl/config/ntapi.c Sat Nov 3 02:12:22 2007 @@ -1,0 +1,649 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmapi.c + * PURPOSE: Configuration Manager - Internal Registry APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +NtDeleteKey(IN HANDLE KeyHandle) +{ + PKEY_OBJECT KeyObject; + NTSTATUS Status; + REG_DELETE_KEY_INFORMATION DeleteKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtDeleteKey(KH 0x%p)\n", KeyHandle); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + DELETE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + DeleteKeyInfo.Object = (PVOID)KeyObject; + Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmDeleteKey(KeyObject->KeyControlBlock); + + /* Remove the keep-alive reference */ + ObDereferenceObject(KeyObject); + if (KeyObject->KeyControlBlock->KeyHive != + KeyObject->KeyControlBlock->ParentKcb->KeyHive) + { + /* Dereference again */ + ObDereferenceObject(KeyObject); + } + + /* Do post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); + } + + /* Dereference the object */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtEnumerateKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtEnumerateKey() KH 0x%x, Index 0x%x, KIC %d, Length %d\n", + KeyHandle, Index, KeyInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_ENUMERATE_SUB_KEYS, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Index = Index; + EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; + EnumerateKeyInfo.Length = Length; + EnumerateKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateKey(KeyObject->KeyControlBlock, + Index, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); + } + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtEnumerateValueKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", + KeyHandle, Index, KeyValueInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Index = Index; + EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; + EnumerateValueKeyInfo.Length = Length; + EnumerateValueKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, + &EnumerateValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateValueKey(KeyObject->KeyControlBlock, + Index, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); + } + + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtQueryKey(IN HANDLE KeyHandle, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_QUERY_KEY_INFORMATION QueryKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", + KeyHandle, KeyInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + (KeyInformationClass != + KeyNameInformation) ? + KEY_QUERY_VALUE : 0, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + QueryKeyInfo.Object = (PVOID)KeyObject; + QueryKeyInfo.KeyInformationClass = KeyInformationClass; + QueryKeyInfo.KeyInformation = KeyInformation; + QueryKeyInfo.Length = Length; + QueryKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmQueryKey(KeyObject->KeyControlBlock, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); + } + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtQueryValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", + KeyHandle, ValueName, KeyValueInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + QueryValueKeyInfo.Object = (PVOID)KeyObject; + QueryValueKeyInfo.ValueName = ValueName; + QueryValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + QueryValueKeyInfo.Length = Length; + QueryValueKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmQueryValueKey(KeyObject->KeyControlBlock, + *ValueName, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); + } + + DPRINT("NtQueryValueKey() returning 0x%08X\n", Status); + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtSetValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN ULONG TitleIndex, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtSetValueKey() KH 0x%x, VN '%wZ', TI %x, T %d, DS %d\n", + KeyHandle, ValueName, TitleIndex, Type, DataSize); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_SET_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ObReferenceObjectByHandle() failed with Status = 0x%08X\n", Status); + return Status; + } + + /* Setup callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + SetValueKeyInfo.Object = (PVOID)KeyObject; + SetValueKeyInfo.ValueName = ValueName; + SetValueKeyInfo.TitleIndex = TitleIndex; + SetValueKeyInfo.Type = Type; + SetValueKeyInfo.Data = Data; + SetValueKeyInfo.DataSize = DataSize; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmSetValueKey(KeyObject->KeyControlBlock, + ValueName, + Type, + Data, + DataSize); + } + + /* Do the post-callback and de-reference the key object */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); + ObDereferenceObject(KeyObject); + + /* Synchronize the hives and return */ + CmiSyncHives(); + return Status; +} + +NTSTATUS +NTAPI +NtDeleteValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName) +{ + PKEY_OBJECT KeyObject; + NTSTATUS Status; + REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_SET_VALUE, + CmpKeyObjectType, + PreviousMode, + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Do the callback */ + DeleteValueKeyInfo.Object = (PVOID)KeyObject; + DeleteValueKeyInfo.ValueName = ValueName; + Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, + &DeleteValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmDeleteValueKey(KeyObject->KeyControlBlock, *ValueName); + + /* Do the post callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, + &PostOperationInfo); + } + + /* Dereference the key body and synchronize the hives */ + ObDereferenceObject(KeyObject); + CmiSyncHives(); + return Status; +} + +NTSTATUS +NTAPI +NtCompactKeys(IN ULONG Count, + IN PHANDLE KeyArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtCompressKey(IN HANDLE Key) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtLoadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN POBJECT_ATTRIBUTES FileObjectAttributes) +{ + return NtLoadKey2(KeyObjectAttributes, FileObjectAttributes, 0); +} + +NTSTATUS +NTAPI +NtLoadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, + IN POBJECT_ATTRIBUTES SourceFile, + IN ULONG Flags, + IN HANDLE TrustClassKey, + IN HANDLE Event, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE RootHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtLockProductActivationKeys(IN PULONG pPrivateVer, + IN PULONG pSafeMode) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtLockRegistryKey(IN HANDLE KeyHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtNotifyChangeMultipleKeys(IN HANDLE MasterKeyHandle, + IN ULONG Count, + IN POBJECT_ATTRIBUTES SlaveObjects, + IN HANDLE Event, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG CompletionFilter, + IN BOOLEAN WatchTree, + OUT PVOID Buffer, + IN ULONG Length, + IN BOOLEAN Asynchronous) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtNotifyChangeKey(IN HANDLE KeyHandle, + IN HANDLE Event, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG CompletionFilter, + IN BOOLEAN WatchTree, + OUT PVOID Buffer, + IN ULONG Length, + IN BOOLEAN Asynchronous) +{ + return NtNotifyChangeMultipleKeys(KeyHandle, + 0, + NULL, + Event, + ApcRoutine, + ApcContext, + IoStatusBlock, + CompletionFilter, + WatchTree, + Buffer, + Length, + Asynchronous); +} + +NTSTATUS +NTAPI +NtQueryMultipleValueKey(IN HANDLE KeyHandle, + IN OUT PKEY_VALUE_ENTRY ValueList, + IN ULONG NumberOfValues, + OUT PVOID Buffer, + IN OUT PULONG Length, + OUT PULONG ReturnLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtQueryOpenSubKeys(IN POBJECT_ATTRIBUTES TargetKey, + IN ULONG HandleCount) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtQueryOpenSubKeysEx(IN POBJECT_ATTRIBUTES TargetKey, + IN ULONG BufferLength, + IN PVOID Buffer, + IN PULONG RequiredSize) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtReplaceKey(IN POBJECT_ATTRIBUTES ObjectAttributes, + IN HANDLE Key, + IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtRestoreKey(IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG RestoreFlags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSaveKey(IN HANDLE KeyHandle, + IN HANDLE FileHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSaveKeyEx(IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG Flags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSaveMergedKeys(IN HANDLE HighPrecedenceKeyHandle, + IN HANDLE LowPrecedenceKeyHandle, + IN HANDLE FileHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSetInformationKey(IN HANDLE KeyHandle, + IN KEY_SET_INFORMATION_CLASS KeyInformationClass, + IN PVOID KeyInformation, + IN ULONG KeyInformationLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtUnloadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, + IN ULONG Flags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtUnloadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, + IN HANDLE Event) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/config/ntapi.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Sat Nov 3 02:12:22 2007 @@ -72,7 +72,7 @@ */ BOOLEAN NTAPI ObInit(VOID); BOOLEAN NTAPI CmInitSystem1(VOID); -VOID CmShutdownRegistry(VOID); +VOID NTAPI CmShutdownRegistry(VOID); //BOOLEAN CmImportSystemHive(PCHAR ChunkBase, ULONG ChunkSize); //BOOLEAN CmImportHardwareHive(PCHAR ChunkBase, ULONG ChunkSize); BOOLEAN NTAPI KdInitSystem(ULONG Reserved, PLOADER_PARAMETER_BLOCK LoaderBlock); Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sat Nov 3 02:12:22 2007 @@ -123,6 +123,7 @@ <file>cmhook.c</file> <file>cmkcbncb.c</file> <file>cmkeydel.c</file> + <file>cmlazy.c</file> <file>cmmapvw.c</file> <file>cmname.c</file> <file>cmparse.c</file> @@ -132,6 +133,7 @@ <file>cmvalue.c</file> <file>cmvalche.c</file> <file>cmwraprs.c</file> + <file>ntapi.c</file> </directory> <directory name="cm"> <file>ntfunc.c</file>

1 0

[mpiulachs] 30078: Place CreditsGenerator class in its own file "creditsgeneratorenerator.cpp" to make Colin happy
by mpiulachs＠svn.reactos.org 02 Nov '07

02 Nov '07

Author: mpiulachs Date: Sat Nov 3 02:01:03 2007 New Revision: 30078 URL: http://svn.reactos.org/svn/reactos?rev=30078&view=rev Log: Place CreditsGenerator class in its own file "creditsgeneratorenerator.cpp" to make Colin happy Added: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (with props) Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp branches/rbuild/reactos/tools/rbuild/rbuild.mak branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Added: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cre… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp (added) +++ branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp Sat Nov 3 02:01:03 2007 @@ -1,0 +1,71 @@ +/* + * Copyright (C) 2007 Marc Piulachs + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include <assert.h> +#include "rbuild.h" + +using std::string; +using std::vector; + + +CreditsGenerator::CreditsGenerator ( const Project& project ) + : project ( project ) +{ +} + +CreditsGenerator::~CreditsGenerator () +{ +} + +void +CreditsGenerator::Generate () +{ + char* buf; + char* s; + + buf = (char*) malloc ( 512*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n"); + + for ( size_t i = 0; i < project.contributors.size (); i++ ) + { + Contributor& contributor = *project.contributors[i]; + + s = s + sprintf ( s, "\t%s %s (%s)\n" , + contributor.firstName.c_str() , + contributor.lastName.c_str() , + contributor.alias.c_str()); + + s = s + sprintf ( s, "\t\t%s\n" , contributor.mail.c_str()); + + if (strlen(contributor.city.c_str()) > 0 && + strlen(contributor.country.c_str()) > 0) + { + s = s + sprintf ( s, "\t\t%s,%s\n\n" , + contributor.city.c_str() , + contributor.country.c_str()); + } + } + + + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); + + free ( buf ); +} Propchange: branches/rbuild/reactos/tools/rbuild/creditsgeneratorenerator.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Sat Nov 3 02:01:03 2007 @@ -91,52 +91,3 @@ free ( buf ); } - - -CreditsGenerator::CreditsGenerator ( const Project& project ) - : project ( project ) -{ -} - -CreditsGenerator::~CreditsGenerator () -{ -} - -void -CreditsGenerator::Generate () -{ - char* buf; - char* s; - - buf = (char*) malloc ( 512*1024 ); - if ( buf == NULL ) - throw OutOfMemoryException (); - - s = buf; - s = s + sprintf ( s, "ReactOS is available thanks to the work of:\n\n"); - - for ( size_t i = 0; i < project.contributors.size (); i++ ) - { - Contributor& contributor = *project.contributors[i]; - - s = s + sprintf ( s, "\t%s %s (%s)\n" , - contributor.firstName.c_str() , - contributor.lastName.c_str() , - contributor.alias.c_str()); - - s = s + sprintf ( s, "\t\t%s\n" , contributor.mail.c_str()); - - if (strlen(contributor.city.c_str()) > 0 && - strlen(contributor.country.c_str()) > 0) - { - s = s + sprintf ( s, "\t\t%s,%s\n\n" , - contributor.city.c_str() , - contributor.country.c_str()); - } - } - - - FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); - - free ( buf ); -} Modified: branches/rbuild/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.mak (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.mak Sat Nov 3 02:01:03 2007 @@ -266,6 +266,7 @@ testsupportcode.cpp \ modulesmanifestgenerator.cpp \ modulesresourcegenerator.cpp \ + creditsgeneratorenerator.cpp \ wineresource.cpp \ xmlnode.cpp \ ) @@ -458,6 +459,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)creditsgeneratorenerator.o: $(RBUILD_BASE_)creditsgeneratorenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)modulesmanifestgenerator.o: $(RBUILD_BASE_)modulesmanifestgenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Modified: branches/rbuild/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.vcproj (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Sat Nov 3 02:01:03 2007 @@ -684,6 +684,10 @@ </FileConfiguration> </File> <File + RelativePath=".\creditsgeneratorenerator.cpp" + > + </File> + <File RelativePath="define.cpp" > <FileConfiguration

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs