Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 28672: Translate the new Restart Button into German
by dreimer＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: dreimer Date: Thu Aug 30 20:26:24 2007 New Revision: 28672 URL: http://svn.reactos.org/svn/reactos?rev=28672&view=rev Log: Translate the new Restart Button into German Modified: trunk/reactos/base/shell/explorer/explorer-de.rc Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc Thu Aug 30 20:26:24 2007 @@ -336,7 +336,7 @@ IDS_START "Start" IDS_LOGOFF "Abmelden..." IDS_SHUTDOWN "Herunterfahren..." - IDS_RESTART "Restart..." + IDS_RESTART "Neustarten..." IDS_LAUNCH "Ausführen..." IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..."

1 0

[gedmurphy] 28671: update the visual service count when a service is deleted
by gedmurphy＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: gedmurphy Date: Thu Aug 30 17:39:59 2007 New Revision: 28671 URL: http://svn.reactos.org/svn/reactos?rev=28671&view=rev Log: update the visual service count when a service is deleted Modified: trunk/reactos/base/applications/mscutils/servman/create.c trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/listview.c trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c Thu Aug 30 17:39:59 2007 @@ -318,17 +318,21 @@ { case WM_INITDIALOG: { - hIcon = (HICON) LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + hIcon = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hIcon) + { + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + DestroyIcon(hIcon); + } + return TRUE; } @@ -340,10 +344,10 @@ { PCREATE_DATA Data; - Data = (PCREATE_DATA) HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(CREATE_DATA)); - if (Data != NULL) + Data = (PCREATE_DATA)HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(CREATE_DATA)); + if (Data) { Data->hSelf = hDlg; @@ -362,7 +366,6 @@ FreeMemory(Data); } - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -370,7 +373,6 @@ case IDCANCEL: { - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c Thu Aug 30 17:39:59 2007 @@ -119,8 +119,11 @@ case IDOK: { if (DoDeleteService(Info, hDlg)) + { (void)ListView_DeleteItem(Info->hListView, Info->SelectedItem); + UpdateServiceCount(Info); + } EndDialog(hDlg, LOWORD(wParam)); return TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c Thu Aug 30 17:39:59 2007 @@ -231,8 +231,6 @@ ENUM_SERVICE_STATUS_PROCESS *pService; LPTSTR lpDescription; LVITEM lvItem; - LPTSTR lpNumServices; - TCHAR szNumServices[32]; TCHAR szStatus[64]; DWORD NumServices; DWORD Index; @@ -241,8 +239,6 @@ if (GetServiceList(Info, &NumServices)) { - INT NumListedServ = 0; - for (Index = 0; Index < NumServices; Index++) { LPQUERY_SERVICE_CONFIG pServiceConfig; @@ -334,26 +330,7 @@ } } - if (AllocAndLoadString(&lpNumServices, - hInstance, - IDS_NUM_SERVICES)) - { - NumListedServ = ListView_GetItemCount(Info->hListView); - - _sntprintf(szNumServices, - 31, - lpNumServices, - NumListedServ); - - SendMessage(Info->hStatus, - SB_SETTEXT, - 0, - (LPARAM)szNumServices); - - HeapFree(ProcessHeap, - 0, - lpNumServices); - } + UpdateServiceCount(Info); } /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */ Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Thu Aug 30 17:39:59 2007 @@ -118,6 +118,35 @@ SB_SIMPLE, (WPARAM)Info->bInMenuLoop, 0); + } +} + +VOID +UpdateServiceCount(PMAIN_WND_INFO Info) +{ + LPTSTR lpNumServices; + + if (AllocAndLoadString(&lpNumServices, + hInstance, + IDS_NUM_SERVICES)) + { + TCHAR szNumServices[32]; + + INT NumListedServ = ListView_GetItemCount(Info->hListView); + + _sntprintf(szNumServices, + 31, + lpNumServices, + NumListedServ); + + SendMessage(Info->hStatus, + SB_SETTEXT, + 0, + (LPARAM)szNumServices); + + HeapFree(ProcessHeap, + 0, + lpNumServices); } } Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Thu Aug 30 17:39:59 2007 @@ -60,6 +60,7 @@ UINT HintId; } MENU_HINT, *PMENU_HINT; +VOID UpdateServiceCount(PMAIN_WND_INFO Info); VOID ChangeListViewText(PMAIN_WND_INFO Info, ENUM_SERVICE_STATUS_PROCESS* pService, UINT Column); BOOL InitMainWindowImpl(VOID); VOID UninitMainWindowImpl(VOID);

1 0

[gedmurphy] 28670: - implement setting the service description - fix deleting of a service
by gedmurphy＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: gedmurphy Date: Thu Aug 30 16:27:11 2007 New Revision: 28670 URL: http://svn.reactos.org/svn/reactos?rev=28670&view=rev Log: - implement setting the service description - fix deleting of a service Modified: trunk/reactos/base/applications/mscutils/servman/create.c trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/servman.c Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c Thu Aug 30 16:27:11 2007 @@ -60,10 +60,10 @@ return FALSE; } - /* Set the service description in the registry - * CreateService does not do this for us */ - //SetDescription(Data->ServiceName, - // Data->Description); + /* Set the service description as CreateService + does not do this for us */ + SetServiceDescription(Data->ServiceName, + Data->Description); /* report success to user */ LoadString(hInstance, Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c Thu Aug 30 16:27:11 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/delete.c + * FILE: base/applications/mscutils/servman/delete.c * PURPOSE: Delete an existing service - * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -15,42 +15,30 @@ { SC_HANDLE hSCManager; SC_HANDLE hSc; + BOOL bRet = FALSE; - /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (hSCManager == NULL) + if (hSCManager) { - GetError(); - return FALSE; + hSc = OpenService(hSCManager, + Info->pCurrentService->lpServiceName, + DELETE); + if (hSc) + { + if (DeleteService(hSc)) + { + bRet = TRUE; + } + + CloseServiceHandle(hSc); + } + + CloseServiceHandle(hSCManager); } - /* get a handle to the service requested for deleting */ - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - DELETE); - if (hSc == NULL) - { - GetError(); - CloseServiceHandle(hSCManager); - return FALSE; - } - - /* delete the service opened */ - if (! DeleteService(hSc)) - { - GetError(); - CloseServiceHandle(hSCManager); - CloseServiceHandle(hSc); - return FALSE; - } - - - CloseServiceHandle(hSCManager); - CloseServiceHandle(hSc); - - return TRUE; + return bRet; } @@ -62,53 +50,66 @@ { PMAIN_WND_INFO Info = NULL; HICON hIcon = NULL; - TCHAR Buf[1000]; - LVITEM item; + + /* Get the window context */ + Info = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + GWLP_USERDATA); + if (Info == NULL && message != WM_INITDIALOG) + { + return FALSE; + } switch (message) { case WM_INITDIALOG: { + LPTSTR lpDescription; + Info = (PMAIN_WND_INFO)lParam; + if (Info != NULL) + { + SetWindowLongPtr(hDlg, + GWLP_USERDATA, + (LONG_PTR)Info); - hIcon = (HICON) LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); + hIcon = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hIcon) + { + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + DestroyIcon(hIcon); + } - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + SendDlgItemMessage(hDlg, + IDC_DEL_NAME, + WM_SETTEXT, + 0, + (LPARAM)Info->pCurrentService->lpDisplayName); - SendDlgItemMessage(hDlg, - IDC_DEL_NAME, - WM_SETTEXT, - 0, - (LPARAM)Info->pCurrentService->lpDisplayName); + lpDescription = GetServiceDescription(Info->pCurrentService->lpServiceName); + if (lpDescription) + { + SendDlgItemMessage(hDlg, + IDC_DEL_DESC, + WM_SETTEXT, + 0, + (LPARAM)lpDescription); + HeapFree(ProcessHeap, + 0, + lpDescription); + } + return TRUE; + } - item.mask = LVIF_TEXT; - item.iItem = Info->SelectedItem; - item.iSubItem = 1; - item.pszText = Buf; - item.cchTextMax = sizeof(Buf); - SendMessage(Info->hListView, - LVM_GETITEM, - 0, - (LPARAM)&item); - - SendDlgItemMessage(hDlg, - IDC_DEL_DESC, - WM_SETTEXT, - 0, - (LPARAM)Buf); - - SetFocus(GetDlgItem(hDlg, IDCANCEL)); - - return TRUE; + return FALSE; } case WM_COMMAND: @@ -120,8 +121,6 @@ if (DoDeleteService(Info, hDlg)) (void)ListView_DeleteItem(Info->hListView, Info->SelectedItem); - - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -129,7 +128,6 @@ case IDCANCEL: { - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Thu Aug 30 16:27:11 2007 @@ -88,6 +88,7 @@ LPQUERY_SERVICE_CONFIG GetServiceConfig(LPTSTR lpServiceName); BOOL SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig, LPTSTR lpServiceName, LPTSTR lpPassword); LPTSTR GetServiceDescription(LPTSTR lpServiceName); +BOOL SetServiceDescription(LPTSTR lpServiceName, LPTSTR lpDescription); LPTSTR GetExecutablePath(LPTSTR lpServiceName); BOOL RefreshServiceList(PMAIN_WND_INFO Info); BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Thu Aug 30 16:27:11 2007 @@ -210,6 +210,53 @@ return lpDescription; } + +BOOL +SetServiceDescription(LPTSTR lpServiceName, + LPTSTR lpDescription) +{ + SC_HANDLE hSCManager; + SC_HANDLE hSc; + SC_LOCK scLock; + SERVICE_DESCRIPTION ServiceDescription; + BOOL bRet = FALSE; + + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_LOCK); + if (hSCManager) + { + scLock = LockServiceDatabase(hSCManager); + if (scLock) + { + hSc = OpenService(hSCManager, + lpServiceName, + SERVICE_CHANGE_CONFIG); + if (hSc) + { + ServiceDescription.lpDescription = lpDescription; + + if (ChangeServiceConfig2(hSc, + SERVICE_CONFIG_DESCRIPTION, + &ServiceDescription)) + { + bRet = TRUE; + } + + CloseServiceHandle(hSc); + } + + UnlockServiceDatabase(scLock); + } + + CloseServiceHandle(hSCManager); + } + + if (!bRet) + GetError(); + + return bRet; +} BOOL Modified: trunk/reactos/base/applications/mscutils/servman/servman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.c (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.c Thu Aug 30 16:27:11 2007 @@ -64,6 +64,3 @@ return Ret; } - - -

1 0

[gedmurphy] 28669: fix build. didn't realise this was still used.
by gedmurphy＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: gedmurphy Date: Thu Aug 30 13:57:08 2007 New Revision: 28669 URL: http://svn.reactos.org/svn/reactos?rev=28669&view=rev Log: fix build. didn't realise this was still used. Modified: trunk/reactos/base/applications/mscutils/servman/create.c Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c Thu Aug 30 13:57:08 2007 @@ -62,8 +62,8 @@ /* Set the service description in the registry * CreateService does not do this for us */ - SetDescription(Data->ServiceName, - Data->Description); + //SetDescription(Data->ServiceName, + // Data->Description); /* report success to user */ LoadString(hInstance,

1 0

[gedmurphy] 28668: - remove the last of the reactos hacks of reading directly from the service's registry keys. - servman appears to be broken in reactos at the moment, but it is actually implemented correctly now. It awaits widl / rpcrt4 updates and a working services.exe.
by gedmurphy＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: gedmurphy Date: Thu Aug 30 13:29:45 2007 New Revision: 28668 URL: http://svn.reactos.org/svn/reactos?rev=28668&view=rev Log: - remove the last of the reactos hacks of reading directly from the service's registry keys. - servman appears to be broken in reactos at the moment, but it is actually implemented correctly now. It awaits widl / rpcrt4 updates and a working services.exe. Removed: trunk/reactos/base/applications/mscutils/servman/reg.c Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild Removed: trunk/reactos/base/applications/mscutils/servman/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/reg.c (original) +++ trunk/reactos/base/applications/mscutils/servman/reg.c (removed) @@ -1,59 +1,0 @@ -/* - * PROJECT: ReactOS Services - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/servman/reg.c - * PURPOSE: functions for querying a services registry key - * COPYRIGHT: Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> - * - */ - -#include "precomp.h" - -static HKEY -OpenServiceKey(LPTSTR lpServiceName) -{ - HKEY hKey = NULL; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR buf[300]; - - _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, lpServiceName); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_READ, - &hKey) == ERROR_SUCCESS) - { - return hKey; - } - else - { - return NULL; - } -} - -BOOL -SetDescription(LPTSTR lpServiceName, - LPTSTR lpDescription) -{ - HKEY hKey; - TCHAR szBuf[MAX_PATH]; - BOOL bRet = FALSE; - - hKey = OpenServiceKey(lpServiceName); - if (hKey) - { - if (RegSetValueEx(hKey, - _T("Description"), - 0, - REG_SZ, - (LPBYTE)lpDescription, - (DWORD)(_tcslen(szBuf) + 1 ) * sizeof(TCHAR)) == ERROR_SUCCESS) - { - bRet = TRUE; - } - - RegCloseKey(hKey); - } - - return bRet; -} Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild Thu Aug 30 13:29:45 2007 @@ -26,7 +26,6 @@ <file>progress.c</file> <file>propsheet.c</file> <file>query.c</file> - <file>reg.c</file> <file>servman.c</file> <file>start.c</file> </compilationunit>

1 0

[hpoussin] 28667: [FORMATTING] Fix spaces/tabs mess No code change.
by hpoussin＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: hpoussin Date: Thu Aug 30 12:38:30 2007 New Revision: 28667 URL: http://svn.reactos.org/svn/reactos?rev=28667&view=rev Log: [FORMATTING] Fix spaces/tabs mess No code change. Modified: trunk/reactos/tools/mkhive/mkhive.c trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.c (original) +++ trunk/reactos/tools/mkhive/mkhive.c Thu Aug 30 12:38:30 2007 @@ -49,127 +49,126 @@ void usage (void) { - printf ("Usage: mkhive <srcdir> <dstdir> [addinf]\n\n"); - printf (" srcdir - inf files are read from this directory\n"); - printf (" dstdir - binary hive files are created in this directory\n"); - printf (" addinf - additional inf files with full path\n"); + printf ("Usage: mkhive <srcdir> <dstdir> [addinf]\n\n"); + printf (" srcdir - inf files are read from this directory\n"); + printf (" dstdir - binary hive files are created in this directory\n"); + printf (" addinf - additional inf files with full path\n"); } void convert_path(char *dst, char *src) { - int i; + int i; - i = 0; - while (src[i] != 0) - { + i = 0; + while (src[i] != 0) + { #ifdef WINDOWS_HOST - if (src[i] == '/') - { - dst[i] = '\\'; + if (src[i] == '/') + { + dst[i] = '\\'; + } +#else + if (src[i] == '\\') + { + dst[i] = '/'; + } +#endif + else + { + dst[i] = src[i]; + } + + i++; } -#else - if (src[i] == '\\') - { - dst[i] = '/'; - } -#endif - else - { - dst[i] = src[i]; - } - - i++; - } - dst[i] = 0; + dst[i] = 0; } - int main (int argc, char *argv[]) { - char FileName[PATH_MAX]; - int Param; + char FileName[PATH_MAX]; + int Param; - printf ("Binary hive maker\n"); + printf ("Binary hive maker\n"); - if (argc < 3) - { - usage (); - return 1; - } + if (argc < 3) + { + usage (); + return 1; + } - RegInitializeRegistry (); + RegInitializeRegistry (); - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivesys.inf"); - ImportRegistryFile (FileName); + convert_path (FileName, argv[1]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "hivesys.inf"); + ImportRegistryFile (FileName); - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivecls.inf"); - ImportRegistryFile (FileName); + convert_path (FileName, argv[1]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "hivecls.inf"); + ImportRegistryFile (FileName); - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivesft.inf"); - ImportRegistryFile (FileName); + convert_path (FileName, argv[1]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "hivesft.inf"); + ImportRegistryFile (FileName); - convert_path (FileName, argv[1]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "hivedef.inf"); - ImportRegistryFile (FileName); + convert_path (FileName, argv[1]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "hivedef.inf"); + ImportRegistryFile (FileName); - for (Param = 3; Param < argc; Param++) - { - convert_path (FileName, argv[Param]); - ImportRegistryFile (FileName); - } + for (Param = 3; Param < argc; Param++) + { + convert_path (FileName, argv[Param]); + ImportRegistryFile (FileName); + } - convert_path (FileName, argv[2]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "default"); - if (!ExportBinaryHive (FileName, &DefaultHive)) - { - return 1; - } + convert_path (FileName, argv[2]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "default"); + if (!ExportBinaryHive (FileName, &DefaultHive)) + { + return 1; + } - convert_path (FileName, argv[2]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "sam"); - if (!ExportBinaryHive (FileName, &SamHive)) - { - return 1; - } + convert_path (FileName, argv[2]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "sam"); + if (!ExportBinaryHive (FileName, &SamHive)) + { + return 1; + } - convert_path (FileName, argv[2]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "security"); - if (!ExportBinaryHive (FileName, &SecurityHive)) - { - return 1; - } + convert_path (FileName, argv[2]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "security"); + if (!ExportBinaryHive (FileName, &SecurityHive)) + { + return 1; + } - convert_path (FileName, argv[2]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "software"); - if (!ExportBinaryHive (FileName, &SoftwareHive)) - { - return 1; - } + convert_path (FileName, argv[2]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "software"); + if (!ExportBinaryHive (FileName, &SoftwareHive)) + { + return 1; + } - convert_path (FileName, argv[2]); - strcat (FileName, DIR_SEPARATOR_STRING); - strcat (FileName, "system"); - if (!ExportBinaryHive (FileName, &SystemHive)) - { - return 1; - } + convert_path (FileName, argv[2]); + strcat (FileName, DIR_SEPARATOR_STRING); + strcat (FileName, "system"); + if (!ExportBinaryHive (FileName, &SystemHive)) + { + return 1; + } -// RegShutdownRegistry (); + //RegShutdownRegistry (); - printf (" Done.\n"); + printf (" Done.\n"); - return 0; + return 0; } /* EOF */ Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c (original) +++ trunk/reactos/tools/mkhive/reginf.c Thu Aug 30 12:38:30 2007 @@ -53,33 +53,33 @@ static BOOL GetRootKey (PCHAR Name) { - if (!strcasecmp (Name, "HKCR")) - { - strcpy (Name, "\\Registry\\Machine\\SOFTWARE\\Classes\\"); - return TRUE; - } - - if (!strcasecmp (Name, "HKCU")) - { - strcpy (Name, "\\Registry\\User\\.DEFAULT\\"); - return TRUE; - } - - if (!strcasecmp (Name, "HKLM")) - { - strcpy (Name, "\\Registry\\Machine\\"); - return TRUE; - } - - if (!strcasecmp (Name, "HKU")) - { - strcpy (Name, "\\Registry\\User\\"); - return TRUE; - } + if (!strcasecmp (Name, "HKCR")) + { + strcpy (Name, "\\Registry\\Machine\\SOFTWARE\\Classes\\"); + return TRUE; + } + + if (!strcasecmp (Name, "HKCU")) + { + strcpy (Name, "\\Registry\\User\\.DEFAULT\\"); + return TRUE; + } + + if (!strcasecmp (Name, "HKLM")) + { + strcpy (Name, "\\Registry\\Machine\\"); + return TRUE; + } + + if (!strcasecmp (Name, "HKU")) + { + strcpy (Name, "\\Registry\\User\\"); + return TRUE; + } #if 0 - if (!strcasecmp (Name, "HKR")) - return FALSE; + if (!strcasecmp (Name, "HKR")) + return FALSE; #endif return FALSE; @@ -92,74 +92,78 @@ * Append a multisz string to a multisz registry value. */ static VOID -AppendMultiSzValue (HKEY KeyHandle, - PCHAR ValueName, - PCHAR Strings, - SIZE_T StringSize) +AppendMultiSzValue ( + IN HKEY KeyHandle, + IN PCHAR ValueName, + IN PCHAR Strings, + IN SIZE_T StringSize) { - SIZE_T Size; - ULONG Type; - size_t Total; - PCHAR Buffer; - PCHAR p; - size_t len; - LONG Error; - - Error = RegQueryValueExA (KeyHandle, - ValueName, - NULL, - &Type, - NULL, - &Size); - if ((Error != ERROR_SUCCESS) || - (Type != REG_MULTI_SZ)) - return; - - Buffer = malloc (Size + StringSize); - if (Buffer == NULL) - return; - - Error = RegQueryValueExA (KeyHandle, - ValueName, - NULL, - NULL, - (PUCHAR)Buffer, - &Size); - if (Error != ERROR_SUCCESS) - goto done; - - /* compare each string against all the existing ones */ - Total = Size; - while (*Strings != 0) - { - len = strlen (Strings) + 1; - - for (p = Buffer; *p != 0; p += strlen (p) + 1) - if (!strcasecmp (p, Strings)) - break; - - if (*p == 0) /* not found, need to append it */ - { - memcpy (p, Strings, len); - p[len] = 0; - Total += len; - } - Strings += len; - } - - if (Total != Size) - { - DPRINT ("setting value %s to %s\n", ValueName, Buffer); - RegSetValueExA (KeyHandle, - ValueName, - 0, - REG_MULTI_SZ, - (PCHAR)Buffer, - (ULONG)Total); - } + SIZE_T Size; + ULONG Type; + size_t Total; + PCHAR Buffer; + PCHAR p; + size_t len; + LONG Error; + + Error = RegQueryValueExA ( + KeyHandle, + ValueName, + NULL, + &Type, + NULL, + &Size); + if ((Error != ERROR_SUCCESS) || + (Type != REG_MULTI_SZ)) + return; + + Buffer = malloc (Size + StringSize); + if (Buffer == NULL) + return; + + Error = RegQueryValueExA ( + KeyHandle, + ValueName, + NULL, + NULL, + (PUCHAR)Buffer, + &Size); + if (Error != ERROR_SUCCESS) + goto done; + + /* compare each string against all the existing ones */ + Total = Size; + while (*Strings != 0) + { + len = strlen (Strings) + 1; + + for (p = Buffer; *p != 0; p += strlen (p) + 1) + if (!strcasecmp (p, Strings)) + break; + + if (*p == 0) /* not found, need to append it */ + { + memcpy (p, Strings, len); + p[len] = 0; + Total += len; + } + Strings += len; + } + + if (Total != Size) + { + DPRINT ("setting value %s to %s\n", ValueName, Buffer); + RegSetValueExA ( + KeyHandle, + ValueName, + 0, + REG_MULTI_SZ, + (PCHAR)Buffer, + (ULONG)Total); + } done: - free (Buffer); + free (Buffer); } @@ -169,200 +173,204 @@ * Perform an add/delete registry operation depending on the flags. */ static BOOL -do_reg_operation(HKEY KeyHandle, - PCHAR ValueName, - PINFCONTEXT Context, - ULONG Flags) +do_reg_operation( + IN HKEY KeyHandle, + IN PCHAR ValueName, + IN PINFCONTEXT Context, + IN ULONG Flags) { - CHAR EmptyStr = (CHAR)0; - ULONG Type; - SIZE_T Size; - LONG Error; - - if (Flags & FLG_ADDREG_DELVAL) /* deletion */ - { - if (ValueName) - { - RegDeleteValueA (KeyHandle, - ValueName); - } - else - { - RegDeleteKeyA (KeyHandle, + CHAR EmptyStr = (CHAR)0; + ULONG Type; + SIZE_T Size; + LONG Error; + + if (Flags & FLG_ADDREG_DELVAL) /* deletion */ + { + if (ValueName) + { + RegDeleteValueA (KeyHandle, ValueName); + } + else + { + RegDeleteKeyA (KeyHandle, NULL); + } + + return TRUE; + } + + if (Flags & FLG_ADDREG_KEYONLY) + return TRUE; + + if (Flags & (FLG_ADDREG_NOCLOBBER | FLG_ADDREG_OVERWRITEONLY)) + { + Error = RegQueryValueExA ( + KeyHandle, + ValueName, + NULL, + NULL, + NULL, NULL); - } - - return TRUE; - } - - if (Flags & FLG_ADDREG_KEYONLY) - return TRUE; - - if (Flags & (FLG_ADDREG_NOCLOBBER | FLG_ADDREG_OVERWRITEONLY)) - { - Error = RegQueryValueExA (KeyHandle, - ValueName, - NULL, - NULL, - NULL, - NULL); - if ((Error == ERROR_SUCCESS) && - (Flags & FLG_ADDREG_NOCLOBBER)) + if ((Error == ERROR_SUCCESS) && + (Flags & FLG_ADDREG_NOCLOBBER)) + return TRUE; + + if ((Error != ERROR_SUCCESS) && + (Flags & FLG_ADDREG_OVERWRITEONLY)) + return TRUE; + } + + switch (Flags & FLG_ADDREG_TYPE_MASK) + { + case FLG_ADDREG_TYPE_SZ: + Type = REG_SZ; + break; + + case FLG_ADDREG_TYPE_MULTI_SZ: + Type = REG_MULTI_SZ; + break; + + case FLG_ADDREG_TYPE_EXPAND_SZ: + Type = REG_EXPAND_SZ; + break; + + case FLG_ADDREG_TYPE_BINARY: + Type = REG_BINARY; + break; + + case FLG_ADDREG_TYPE_DWORD: + Type = REG_DWORD; + break; + + case FLG_ADDREG_TYPE_NONE: + Type = REG_NONE; + break; + + default: + Type = Flags >> 16; + break; + } + + if (!(Flags & FLG_ADDREG_BINVALUETYPE) || + (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5)) + { + PCHAR Str = NULL; + + if (Type == REG_MULTI_SZ) + { + if (InfHostGetMultiSzField (Context, 5, NULL, 0, &Size) != 0) + Size = 0; + + if (Size) + { + Str = malloc (Size); + if (Str == NULL) + return FALSE; + + InfHostGetMultiSzField (Context, 5, Str, (ULONG)Size, NULL); + } + + if (Flags & FLG_ADDREG_APPEND) + { + if (Str == NULL) + return TRUE; + + AppendMultiSzValue ( + KeyHandle, + ValueName, + Str, + Size); + + free (Str); + return TRUE; + } + /* else fall through to normal string handling */ + } + else + { + if (InfHostGetStringField (Context, 5, NULL, 0, &Size) != 0) + Size = 0; + + if (Size) + { + Str = malloc (Size); + if (Str == NULL) + return FALSE; + + InfHostGetStringField (Context, 5, Str, (ULONG)Size, NULL); + } + } + + if (Type == REG_DWORD) + { + ULONG dw = Str ? strtoul (Str, NULL, 0) : 0; + + DPRINT("setting dword %s to %lx\n", ValueName, dw); + + RegSetValueExA ( + KeyHandle, + ValueName, + 0, + Type, + (const PUCHAR)&dw, + sizeof(ULONG)); + } + else + { + DPRINT("setting value %s to %s\n", ValueName, Str); + + if (Str) + { + RegSetValueExA ( + KeyHandle, + ValueName, + 0, + Type, + (PVOID)Str, + (ULONG)Size); + } + else + { + RegSetValueExA ( + KeyHandle, + ValueName, + 0, + Type, + (PVOID)&EmptyStr, + (ULONG)sizeof(CHAR)); + } + } + free (Str); + } + else /* get the binary data */ + { + PCHAR Data = NULL; + + if (InfHostGetBinaryField (Context, 5, NULL, 0, &Size) != 0) + Size = 0; + + if (Size) + { + Data = malloc (Size); + if (Data == NULL) + return FALSE; + + DPRINT("setting binary data %s len %lu\n", ValueName, Size); + InfHostGetBinaryField (Context, 5, Data, (ULONG)Size, NULL); + } + + RegSetValueExA ( + KeyHandle, + ValueName, + 0, + Type, + (PVOID)Data, + (ULONG)Size); + + free (Data); + } + return TRUE; - - if ((Error != ERROR_SUCCESS) && - (Flags & FLG_ADDREG_OVERWRITEONLY)) - return TRUE; - } - - switch (Flags & FLG_ADDREG_TYPE_MASK) - { - case FLG_ADDREG_TYPE_SZ: - Type = REG_SZ; - break; - - case FLG_ADDREG_TYPE_MULTI_SZ: - Type = REG_MULTI_SZ; - break; - - case FLG_ADDREG_TYPE_EXPAND_SZ: - Type = REG_EXPAND_SZ; - break; - - case FLG_ADDREG_TYPE_BINARY: - Type = REG_BINARY; - break; - - case FLG_ADDREG_TYPE_DWORD: - Type = REG_DWORD; - break; - - case FLG_ADDREG_TYPE_NONE: - Type = REG_NONE; - break; - - default: - Type = Flags >> 16; - break; - } - - if (!(Flags & FLG_ADDREG_BINVALUETYPE) || - (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5)) - { - PCHAR Str = NULL; - - if (Type == REG_MULTI_SZ) - { - if (InfHostGetMultiSzField (Context, 5, NULL, 0, &Size) != 0) - Size = 0; - - if (Size) - { - Str = malloc (Size); - if (Str == NULL) - return FALSE; - - InfHostGetMultiSzField (Context, 5, Str, (ULONG)Size, NULL); - } - - if (Flags & FLG_ADDREG_APPEND) - { - if (Str == NULL) - return TRUE; - - AppendMultiSzValue (KeyHandle, - ValueName, - Str, - Size); - - free (Str); - return TRUE; - } - /* else fall through to normal string handling */ - } - else - { - if (InfHostGetStringField (Context, 5, NULL, 0, &Size) != 0) - Size = 0; - - if (Size) - { - Str = malloc (Size); - if (Str == NULL) - return FALSE; - - InfHostGetStringField (Context, 5, Str, (ULONG)Size, NULL); - } - } - - if (Type == REG_DWORD) - { - ULONG dw = Str ? strtoul (Str, NULL, 0) : 0; - - DPRINT("setting dword %s to %lx\n", ValueName, dw); - - RegSetValueExA (KeyHandle, - ValueName, - 0, - Type, - (const PUCHAR)&dw, - sizeof(ULONG)); - } - else - { - DPRINT("setting value %s to %s\n", ValueName, Str); - - if (Str) - { - RegSetValueExA (KeyHandle, - ValueName, - 0, - Type, - (PVOID)Str, - (ULONG)Size); - } - else - { - RegSetValueExA (KeyHandle, - ValueName, - 0, - Type, - (PVOID)&EmptyStr, - (ULONG)sizeof(CHAR)); - } - } - free (Str); - } - else /* get the binary data */ - { - PCHAR Data = NULL; - - if (InfHostGetBinaryField (Context, 5, NULL, 0, &Size) != 0) - Size = 0; - - if (Size) - { - Data = malloc (Size); - if (Data == NULL) - return FALSE; - - DPRINT("setting binary data %s len %lu\n", ValueName, Size); - InfHostGetBinaryField (Context, 5, Data, (ULONG)Size, NULL); - } - - RegSetValueExA (KeyHandle, - ValueName, - 0, - Type, - (PVOID)Data, - (ULONG)Size); - - free (Data); - } - - return TRUE; } - /*********************************************************************** * registry_callback @@ -372,114 +380,114 @@ static BOOL registry_callback (HINF hInf, PCHAR Section, BOOL Delete) { - CHAR Buffer[MAX_INF_STRING_LENGTH]; - PCHAR ValuePtr; - ULONG Flags; - size_t Length; - - PINFCONTEXT Context = NULL; - HKEY KeyHandle; - BOOL Ok; - - - Ok = InfHostFindFirstLine (hInf, Section, NULL, &Context) == 0; - if (!Ok) - return TRUE; /* Don't fail if the section isn't present */ - - for (;Ok; Ok = (InfHostFindNextLine (Context, Context) == 0)) - { - /* get root */ - if (InfHostGetStringField (Context, 1, Buffer, MAX_INF_STRING_LENGTH, NULL) != 0) - continue; - if (!GetRootKey (Buffer)) - continue; - - /* get key */ - Length = strlen (Buffer); - if (InfHostGetStringField (Context, 2, Buffer + Length, MAX_INF_STRING_LENGTH - (ULONG)Length, NULL) != 0) - *Buffer = 0; - - DPRINT("KeyName: <%s>\n", Buffer); - - if (Delete) - { - Flags = FLG_ADDREG_DELVAL; - } - else - { - /* get flags */ - if (InfHostGetIntField (Context, 4, (PLONG)&Flags) != 0) - Flags = 0; - } - - DPRINT("Flags: %lx\n", Flags); - - if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) - { - if (RegOpenKeyA (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) - { - DPRINT("RegOpenKey(%s) failed\n", Buffer); - continue; /* ignore if it doesn't exist */ - } - } - else - { - if (RegCreateKeyA (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) - { - DPRINT("RegCreateKey(%s) failed\n", Buffer); - continue; - } - } - - /* get value name */ - if (InfHostGetStringField (Context, 3, Buffer, MAX_INF_STRING_LENGTH, NULL) == 0) - { - ValuePtr = Buffer; - } - else - { - ValuePtr = NULL; - } - - /* and now do it */ - if (!do_reg_operation (KeyHandle, ValuePtr, Context, Flags)) - { - return FALSE; - } - } - - InfHostFreeContext(Context); - - return TRUE; + CHAR Buffer[MAX_INF_STRING_LENGTH]; + PCHAR ValuePtr; + ULONG Flags; + size_t Length; + + PINFCONTEXT Context = NULL; + HKEY KeyHandle; + BOOL Ok; + + + Ok = InfHostFindFirstLine (hInf, Section, NULL, &Context) == 0; + if (!Ok) + return TRUE; /* Don't fail if the section isn't present */ + + for (;Ok; Ok = (InfHostFindNextLine (Context, Context) == 0)) + { + /* get root */ + if (InfHostGetStringField (Context, 1, Buffer, MAX_INF_STRING_LENGTH, NULL) != 0) + continue; + if (!GetRootKey (Buffer)) + continue; + + /* get key */ + Length = strlen (Buffer); + if (InfHostGetStringField (Context, 2, Buffer + Length, MAX_INF_STRING_LENGTH - (ULONG)Length, NULL) != 0) + *Buffer = 0; + + DPRINT("KeyName: <%s>\n", Buffer); + + if (Delete) + { + Flags = FLG_ADDREG_DELVAL; + } + else + { + /* get flags */ + if (InfHostGetIntField (Context, 4, (PLONG)&Flags) != 0) + Flags = 0; + } + + DPRINT("Flags: %lx\n", Flags); + + if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) + { + if (RegOpenKeyA (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) + { + DPRINT("RegOpenKey(%s) failed\n", Buffer); + continue; /* ignore if it doesn't exist */ + } + } + else + { + if (RegCreateKeyA (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) + { + DPRINT("RegCreateKey(%s) failed\n", Buffer); + continue; + } + } + + /* get value name */ + if (InfHostGetStringField (Context, 3, Buffer, MAX_INF_STRING_LENGTH, NULL) == 0) + { + ValuePtr = Buffer; + } + else + { + ValuePtr = NULL; + } + + /* and now do it */ + if (!do_reg_operation (KeyHandle, ValuePtr, Context, Flags)) + { + return FALSE; + } + } + + InfHostFreeContext(Context); + + return TRUE; } BOOL ImportRegistryFile(PCHAR FileName) { - HINF hInf; - ULONG ErrorLine; - - /* Load inf file from install media. */ - if (InfHostOpenFile(&hInf, FileName, &ErrorLine) != 0) - { - DPRINT1 ("InfHostOpenFile() failed\n"); - return FALSE; - } - - if (!registry_callback (hInf, "DelReg", TRUE)) - { - DPRINT1 ("registry_callback() failed\n"); - } - - if (!registry_callback (hInf, "AddReg", FALSE)) - { - DPRINT1 ("registry_callback() failed\n"); - } - - InfHostCloseFile (hInf); - - return TRUE; + HINF hInf; + ULONG ErrorLine; + + /* Load inf file from install media. */ + if (InfHostOpenFile(&hInf, FileName, &ErrorLine) != 0) + { + DPRINT1 ("InfHostOpenFile() failed\n"); + return FALSE; + } + + if (!registry_callback (hInf, "DelReg", TRUE)) + { + DPRINT1 ("registry_callback() failed\n"); + } + + if (!registry_callback (hInf, "AddReg", FALSE)) + { + DPRINT1 ("registry_callback() failed\n"); + } + + InfHostCloseFile (hInf); + + return TRUE; } /* EOF */

1 0

[frik85] 28666: RosCMS update: * "stable" button fixed, it generates now related pages
by frik85＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: frik85 Date: Thu Aug 30 12:06:42 2007 New Revision: 28666 URL: http://svn.reactos.org/svn/reactos?rev=28666&view=rev Log: RosCMS update: * "stable" button fixed, it generates now related pages Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php trunk/web/reactos.org/htdocs/roscms/inc/data_maintain_out.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_edit.php Thu Aug 30 12:06:42 2007 @@ -1214,6 +1214,7 @@ function changetags($entr_count, $entr_revid, $entr_flag) { global $roscms_intern_account_id; + global $roscms_standard_language; global $RosCMS_GET_debug; global $h_a; global $h_a2; @@ -1251,8 +1252,9 @@ if ($RosCMS_GET_debug) echo "<li>".$entry_ids2[0]." == ".$entry_ids2[1]."</li>"; $query_rev_data = mysql_query("SELECT * - FROM data_revision - WHERE rev_id = '".mysql_real_escape_string($entry_ids2[1])."' + FROM data_revision r, data_ d + WHERE r.rev_id = '".mysql_real_escape_string($entry_ids2[1])."' + AND r.data_id = d.data_id LIMIT 1;"); $result_rev_data = mysql_fetch_array($query_rev_data); @@ -1343,8 +1345,24 @@ // generate related pages require("inc/data_export_page.php"); - log_event_generate_low("+++++ [generate_page_output_update(".$result_rev_data['data_id'].", ".$result_revision_stable['rev_language'].", ".$temp_dynamic.")]"); - generate_page_output_update($result_rev_data['data_id'], $result_revision_stable['rev_language'], $temp_dynamic); + + if ($result_revision_stable['rev_language'] == "") { + $tmp_lang = $roscms_standard_language; + } + else { + $tmp_lang = $result_revision_stable['rev_language']; + } + + $query_entry = mysql_query("SELECT data_id + FROM data_ + WHERE data_name = '".mysql_real_escape_string($result_rev_data['data_name'])."' + AND data_type = 'page' + LIMIT 1;"); + $result_entry = mysql_fetch_array($query_entry); + + log_event_generate_low("+++++ [generate_page_output_update(".$result_rev_data['data_id'].", ".$tmp_lang.", ".$temp_dynamic.")]"); + if ($RosCMS_GET_debug) echo "! generate_page_output_update(".$result_rev_data['data_id'].", ".$tmp_lang.", ".$temp_dynamic.")"; + echo generate_page_output_update($result_entry['data_id'], $tmp_lang, $temp_dynamic); } else { echo "Only 'new' entries can be made stable"; Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_page.php Thu Aug 30 12:06:42 2007 @@ -31,6 +31,7 @@ function generate_page_output_update($g_data_id, $g_lang_id, $g_page_dynida) { + //echo "!!generate_page_output_update(".$g_data_id.", ".$g_lang_id.", ".$g_page_dynida.")"; global $roscms_standard_language; $query_data = mysql_query("SELECT * @@ -70,7 +71,7 @@ generate_page_output($result_data['data_name'], $tmp_lang, $g_page_dynida); break; case 'template': - echo "generate_update_helper(".$tmp_lang.", ".$result_data['data_type'].", ".$result_data['data_name'].")"; + echo "(a) generate_update_helper(".$tmp_lang.", ".$result_data['data_type'].", ".$result_data['data_name'].")"; generate_update_helper($tmp_lang, $result_data['data_type'], $result_data['data_name']); break; case 'content': @@ -82,12 +83,12 @@ generate_page_output($result_data['data_name'], $tmp_lang, $g_page_dynida); } else { - echo "generate_update_helper(".$tmp_lang.", ".$result_data['data_type'].", ".$result_data['data_name'].")"; + echo "(b) generate_update_helper(".$tmp_lang.", ".$result_data['data_type'].", ".$result_data['data_name'].")"; generate_update_helper($tmp_lang, $result_data['data_type'], $result_data['data_name']); } break; case 'script': - echo "generate_update_helper(".$tmp_lang.", ".$result_data['data_type'].", ".$result_data['data_name'].")"; + echo "(c) generate_update_helper(".$tmp_lang.", ".$result_data['data_type'].", ".$result_data['data_name'].")"; generate_update_helper($tmp_lang, $result_data['data_type'], $result_data['data_name']); break; default: Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_maintain_out.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/data_maintain_out.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/data_maintain_out.php Thu Aug 30 12:06:42 2007 @@ -71,7 +71,8 @@ AND data_type = '".mysql_real_escape_string($RosCMS_GET_d_value2)."' LIMIT 1;"); $result_entry = mysql_fetch_array($query_entry); - + + //echo "generate_page_output_update(".$result_entry['data_id'].", ".$RosCMS_GET_d_value3.", ".$RosCMS_GET_d_value4.")"; echo generate_page_output_update($result_entry['data_id'], $RosCMS_GET_d_value3, $RosCMS_GET_d_value4); } ?>

1 0

[janderwald] 28665: - add linux path - fix bug in getDefaultHDDImage - sysreg can now create the hdd image and start the emulator
by janderwald＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: janderwald Date: Thu Aug 30 04:05:29 2007 New Revision: 28665 URL: http://svn.reactos.org/svn/reactos?rev=28665&view=rev Log: - add linux path - fix bug in getDefaultHDDImage - sysreg can now create the hdd image and start the emulator Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Thu Aug 30 04:05:29 2007 @@ -103,7 +103,11 @@ img = "output-i386"; EnvironmentVariable::getValue(_T("ROS_OUTPUT"), img); +#ifdef __LINUX__ + img += _T("/ros.hd"); +#else img += _T("\\ros.hd"); +#endif } //--------------------------------------------------------------------------------------- bool RosBootTest::isFileExisting(string output) @@ -142,15 +146,17 @@ return false; } -#ifdef __LINUX___ - qemuimgdir += _T("\\qemu-img"); + +#ifdef __LINUX__ + qemuimgdir += _T("/qemu-img"); + #else qemuimgdir += _T("\\qemu-img.exe"); #endif if (!isFileExisting(qemuimgdir)) { - cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img" << endl; + cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img " << qemuimgdir << endl; return false; } Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Thu Aug 30 04:05:29 2007 @@ -74,11 +74,13 @@ $(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + ifneq ($(HOST),mingw32-linux) $(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ endif + $(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Thu Aug 30 04:05:29 2007 @@ -10,8 +10,8 @@ ; ; This variable sets the path to the emulator ; -ROS_EMU_PATH=E:\reactos\qemu\qemu.exe - +;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe +ROS_EMU_PATH=/usr/bin/qemu ; ROS_HDD_IMAGE ;

1 0

[gedmurphy] 28664: release the image resource once it's assigned
by gedmurphy＠svn.reactos.org 29 Aug '07

29 Aug '07

Author: gedmurphy Date: Thu Aug 30 03:05:23 2007 New Revision: 28664 URL: http://svn.reactos.org/svn/reactos?rev=28664&view=rev Log: release the image resource once it's assigned Modified: trunk/reactos/base/applications/mscutils/servman/listview.c Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c Thu Aug 30 03:05:23 2007 @@ -122,7 +122,6 @@ lpServiceConfig); } } - break; case LVDESC: @@ -370,51 +369,57 @@ static VOID InitListViewImage(PMAIN_WND_INFO Info) { - HICON hSmIconItem, hLgIconItem; /* icon for list-view items */ - HIMAGELIST hSmall, hLarge; /* image list for other views */ - - - /* Create the icon image lists */ + HICON hSmIconItem, hLgIconItem; + HIMAGELIST hSmall, hLarge; + hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR32, 1, 1); + if (hSmall) + { + hSmIconItem = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hSmIconItem) + { + ImageList_AddIcon(hSmall, + hSmIconItem); + (void)ListView_SetImageList(Info->hListView, + hSmall, + LVSIL_SMALL); + + DestroyIcon(hSmIconItem); + } + } hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), ILC_MASK | ILC_COLOR32, 1, 1); - - /* Add an icon to each image list */ - hSmIconItem = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); - - ImageList_AddIcon(hSmall, - hSmIconItem); - - hLgIconItem = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 32, - 32, - 0); - - ImageList_AddIcon(hLarge, - hLgIconItem); - - /* assign the image to the list view */ - (void)ListView_SetImageList(Info->hListView, - hSmall, - LVSIL_SMALL); - (void)ListView_SetImageList(Info->hListView, - hLarge, - LVSIL_NORMAL); + if (hLarge) + { + hLgIconItem = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 32, + 32, + 0); + if (hLgIconItem) + { + ImageList_AddIcon(hLarge, + hLgIconItem); + (void)ListView_SetImageList(Info->hListView, + hLarge, + LVSIL_NORMAL); + DestroyIcon(hLgIconItem); + } + } }

1 0

[janderwald] 28663: - always create a hdd image if theres no default one
by janderwald＠svn.reactos.org 29 Aug '07

29 Aug '07

Author: janderwald Date: Thu Aug 30 02:38:44 2007 New Revision: 28663 URL: http://svn.reactos.org/svn/reactos?rev=28663&view=rev Log: - always create a hdd image if theres no default one Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Thu Aug 30 02:38:44 2007 @@ -334,19 +334,15 @@ return true; } - if (m_CDImage.length()) - { - /* ROS_CD_IMAGE is set but no ROS_HDD_IMAGE is set - * so create hdd image */ - if (!createDefaultHDDImage()) - { - /* failed to create hdd image */ - cerr << "Error: failed to create hdd image " << endl; - return false; - } - getDefaultHDDImage(m_HDDImage); - return true; - } + if (!createDefaultHDDImage()) + { + /* failed to create hdd image */ + cerr << "Error: failed to create hdd image " << endl; + return false; + } + getDefaultHDDImage(m_HDDImage); + return true; + /// /// FIXME /// scan m_BootCmd if theres -hda param provided

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