Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 29505: Change "base" to "installbase" for the <bootstrap> element of "green.rbuild" (the older syntax is no longer valid) See issue #2706 for more details.
by cfinck＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: cfinck Date: Thu Oct 11 20:06:11 2007 New Revision: 29505 URL: http://svn.reactos.org/svn/reactos?rev=29505&view=rev Log: Change "base" to "installbase" for the <bootstrap> element of "green.rbuild" (the older syntax is no longer valid) See issue #2706 for more details. Modified: trunk/rosapps/green/green.rbuild Modified: trunk/rosapps/green/green.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/green/green.rbuild?rev=295… ============================================================================== --- trunk/rosapps/green/green.rbuild (original) +++ trunk/rosapps/green/green.rbuild Thu Oct 11 20:06:11 2007 @@ -1,5 +1,5 @@ <module name="green" type="kernelmodedriver" installbase="system32/drivers" installname="green.sys"> - <bootstrap base="reactos" /> + <bootstrap installbase="reactos" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library>

1 0

[dreimer] 29504: We need a rule that updating a RC File forces the dev to do it on ALL Files, not only the English one. German one missed two Dialogs again. Updated the German RC File of shell32.dll and fixed a typo in the English one. (Nice Work with your new Dialogs For Shortcuts and co, Johannes :-))
by dreimer＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: dreimer Date: Thu Oct 11 20:01:18 2007 New Revision: 29504 URL: http://svn.reactos.org/svn/reactos?rev=29504&view=rev Log: We need a rule that updating a RC File forces the dev to do it on ALL Files, not only the English one. German one missed two Dialogs again. Updated the German RC File of shell32.dll and fixed a typo in the English one. (Nice Work with your new Dialogs For Shortcuts and co, Johannes :-)) Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Thu Oct 11 20:01:18 2007 @@ -1,6 +1,7 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2004 Henning Gerhardt + * Copyright 2007 Daniel Reimer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,9 +28,6 @@ MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END -/* - shellview background menu -*/ MENU_002 MENU DISCARDABLE BEGIN POPUP "" @@ -69,9 +67,6 @@ END END -/* - shellview item menu -*/ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" @@ -132,69 +127,69 @@ PUSHBUTTON "&Durchsuchen...", 12288, 170, 63, 50, 14, WS_TABSTOP } - SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Shortcut" +CAPTION "Verknüpfung" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE - LTEXT "Target type:", 14004, 10, 30, 50, 10 + LTEXT "Zeiltyp:", 14004, 10, 30, 50, 10 LTEXT "", 14005, 70, 30, 150, 10 - LTEXT "Target location:", 14006, 10, 40, 70, 10 + LTEXT "Zielpfad:", 14006, 10, 40, 70, 10 LTEXT "", 14007, 70, 40, 150, 10 - LTEXT "Target:", 14008, 10, 55, 45, 10 + LTEXT "Ziel:", 14008, 10, 55, 45, 10 EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT - LTEXT "&Start in:",14010, 10, 65, 45, 10 + LTEXT "&Starten in:",14010, 10, 65, 45, 10 EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT - LTEXT "Shortcut &key:", 14014, 10, 80, 45, 10 + LTEXT "&Tastenkombination:", 14014, 10, 80, 45, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT - LTEXT "Run:", 14016, 10, 90, 45, 10 + LTEXT "Ausführen:", 14016, 10, 90, 45, 10 EDITTEXT 14017, 70, 90, 150, 10 - LTEXT "C&omment:", 14018, 10, 100, 45, 10 + LTEXT "K&ommentar:", 14018, 10, 100, 45, 10 EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT - PUSHBUTTON "&Find Target...", 14020, 10, 115, 60, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 80, 115, 60, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 150, 115, 60, 14, ES_LEFT + PUSHBUTTON "&Ziel finden...", 14020, 10, 115, 60, 14, ES_LEFT + PUSHBUTTON "I&con wechseln...", 14021, 80, 115, 60, 14, ES_LEFT + PUSHBUTTON "Er&weitert...", 14022, 150, 115, 60, 14, ES_LEFT } SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Extended Properties" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ - LTEXT "Select extended properties for this Shortcut", -1, 5, 30, 150, 10 - CHECKBOX "Execute as a different user", 14000, 30, 50, 150, 10 - LTEXT "FIXME Desc", -1, 50, 70, 200, 40 - PUSHBUTTON "OK", IDOK, 25, 130, 40, 15, WS_VISIBLE - PUSHBUTTON "Abbrechen", IDCANCEL, 120, 130, 50, 15, WS_VISIBLE +CAPTION "Erweiterte Einstellungen" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ +LTEXT "Wählen Sie die erweiterten Einstellungen für diese Verknüpfung.", -1, 5, 30, 190, 10 + CHECKBOX "Als anderer Benutzer ausführen", 14000, 30, 50, 150, 10 + LTEXT "Diese Einstellung ermöglicht es, diese Verknüpfung unter\neinem anderen oder Ihrem eingenen Bentzerkonto auszuführen\nwährend der Computer und Ihre Daten vor unautorisierten\nProgrammaktivitäten geschützt werden können.", -1, 50, 60, 200, 40 + CHECKBOX "In getrennten Speicherbereich ausführen", 14001, 30, 100, 90, 10, WS_DISABLED + PUSHBUTTON "OK", IDOK, 25, 120, 40, 15, WS_VISIBLE + PUSHBUTTON "Abbrechen", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE } SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 5, 100, 10, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 10, 30, 50, 10 - LTEXT "File", 14005, 70, 30, 150, 10 - LTEXT "Opens with:", 14006, 10, 40, 50, 10 + LTEXT "Dateityp:", 14004, 10, 30, 50, 10 + LTEXT "Datei", 14005, 70, 30, 150, 10 + LTEXT "Öffnen mit:", 14006, 10, 40, 50, 10 LTEXT "", 14007, 70, 40, 150, 10 - LTEXT "Location:", 14008, 10, 55, 45, 10 + LTEXT "Pfad:", 14008, 10, 55, 45, 10 LTEXT "", 14009, 70, 55, 200, 10 - LTEXT "Size:",14010, 10, 65, 45, 10 + LTEXT "Größe:",14010, 10, 65, 45, 10 LTEXT "", 14011, 70, 65, 150, 10 - LTEXT "Created:", 14014, 10, 80, 45, 10 + LTEXT "Erstellt:", 14014, 10, 80, 45, 10 LTEXT "", 14015, 70, 80, 150, 10 - LTEXT "Modied:", 14016, 10, 90, 45, 10 + LTEXT "Geändert:", 14016, 10, 90, 45, 10 LTEXT "", 14017, 70, 90, 150, 10 - LTEXT "Accessed:", 14018, 10, 100, 45, 10 + LTEXT "Zugegriffen:", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10 - LTEXT "Attributes:", 14020, 10, 115, 45, 10 - CHECKBOX "&Read-only", 14021, 70, 115, 45, 10 - CHECKBOX "&Hidden", 14022, 130, 115, 50, 10 - CHECKBOX "&Archive", 14023, 180, 115, 45, 10 + LTEXT "Attribute:", 14020, 10, 115, 45, 10 + CHECKBOX "&Schreibgeschützt", 14021, 70, 115, 45, 10 + CHECKBOX "&Versteckt", 14022, 130, 115, 50, 10 + CHECKBOX "&Archiv", 14023, 180, 115, 45, 10 } SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 @@ -202,15 +197,15 @@ CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - LTEXT "File version: ", 14000, 10, 10, 45, 10 + LTEXT "Dateiversion: ", 14000, 10, 10, 45, 10 LTEXT "", 14001, 70, 10, 150, 10 - LTEXT "Description: ", 14002, 10, 20, 45, 10 + LTEXT "Beschreibung: ", 14002, 10, 20, 45, 10 LTEXT "", 14003, 70, 20, 150, 10 LTEXT "Copyright: ", 14004, 10, 30, 45, 10 LTEXT "", 14005, 70, 30, 150, 10 - GROUPBOX "Other version information: ", 14006, 10, 45, 220, 90 - LTEXT "Item name: ", 14007, 20, 55, 50, 10 - LTEXT "Value: ", 14008, 130, 55, 45, 10 + GROUPBOX "Weitere Versionsinformationen: ", 14006, 10, 45, 220, 90 + LTEXT "Elementname: ", 14007, 20, 55, 50, 10 + LTEXT "Wert: ", 14008, 130, 55, 45, 10 LISTBOX 14009,20,65,95,60, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 130, 65, 95, 60, ES_LEFT|WS_BORDER|WS_VSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY @@ -221,7 +216,6 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { - //ICON EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP LTEXT "Typ:", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 @@ -268,12 +262,32 @@ PUSHBUTTON "Jetzt &sichern", 14002, 130, 170, 90, 15, WS_TABSTOP } - DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { +} + +RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ausführen als" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + LTEXT "Which user account do you want to use to run this program?", -1, 30, 30, 170, 10 + CHECKBOX "Aktueller Benutzer %s", 14000, 5, 45, 150, 10 + LTEXT "Computer vor unauthorisierten Programmaktiviäten schützen", -1, 40, 65, 150, 10, WS_DISABLED + CHECKBOX "Diese Einstellung kann Computerviren daran hindern, ihrem\nComputer und/oder Ihren persönlichen Daten zu schaden, aber\nes kann auch Programme daran hindern, Ordnungsgemäß zu arbeiten.", 14001, 40, 80, 150, 10, WS_DISABLED + CHECKBOX "Folgender Benutzer:", 14002, 5, 100, 90, 10 + LTEXT "Benutzername:", -1, 15, 115, 60, 10 + COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP + LTEXT "Passwort:", -1, 15, 140, 60, 10 + EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP + PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP + PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP + PUSHBUTTON "Abbrechen", 14008, 140, 170, 60, 15, WS_TABSTOP } STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Thu Oct 11 20:01:18 2007 @@ -187,7 +187,7 @@ LTEXT "", 14011, 70, 65, 150, 10 LTEXT "Created:", 14014, 10, 80, 45, 10 LTEXT "", 14015, 70, 80, 150, 10 - LTEXT "Modied:", 14016, 10, 90, 45, 10 + LTEXT "Modified:", 14016, 10, 90, 45, 10 LTEXT "", 14017, 70, 90, 150, 10 LTEXT "Accessed:", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10

1 0

[fireball] 29503: - Insert back the "ugly hack for cut&paste files" (removed by 29499 commit).
by fireball＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: fireball Date: Thu Oct 11 18:47:10 2007 New Revision: 29503 URL: http://svn.reactos.org/svn/reactos?rev=29503&view=rev Log: - Insert back the "ugly hack for cut&paste files" (removed by 29499 commit). Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Thu Oct 11 18:47:10 2007 @@ -38,6 +38,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +/* ugly hack for cut&paste files */ +BOOL fileMoving = FALSE; + /************************************************************************** * IContextMenu Implementation */

1 0

[gedmurphy] 29502: use ChangeListViewText to fill out the service info
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Thu Oct 11 16:21:06 2007 New Revision: 29502 URL: http://svn.reactos.org/svn/reactos?rev=29502&view=rev Log: use ChangeListViewText to fill out the service info 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 Oct 11 16:21:06 2007 @@ -229,9 +229,7 @@ RefreshServiceList(PMAIN_WND_INFO Info) { ENUM_SERVICE_STATUS_PROCESS *pService; - LPTSTR lpDescription; LVITEM lvItem; - TCHAR szStatus[64]; DWORD NumServices; DWORD Index; @@ -246,7 +244,7 @@ { for (Index = 0; Index < NumServices; Index++) { - LPQUERY_SERVICE_CONFIG pServiceConfig; + INT i; pService = &Info->pAllServices[Index]; @@ -261,75 +259,10 @@ /* add it to the listview */ lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); - /* set the description */ - if ((lpDescription = GetServiceDescription(pService->lpServiceName))) - { - lvItem.pszText = lpDescription; - lvItem.iSubItem = LVDESC; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - HeapFree(ProcessHeap, - 0, - lpDescription); - } - - /* set the status */ - if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) - { - LoadString(hInstance, - IDS_SERVICES_STARTED, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - lvItem.pszText = szStatus; - lvItem.iSubItem = LVSTATUS; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } - - pServiceConfig = GetServiceConfig(pService->lpServiceName); - if (pServiceConfig) - { - DWORD StringId = 0; - LPTSTR lpStartup; - - /* set the startup type */ - switch (pServiceConfig->dwStartType) - { - case 2: StringId = IDS_SERVICES_AUTO; break; - case 3: StringId = IDS_SERVICES_MAN; break; - case 4: StringId = IDS_SERVICES_DIS; break; - } - - if (StringId) - AllocAndLoadString(&lpStartup, - hInstance, - StringId); - - lvItem.pszText = lpStartup; - lvItem.iSubItem = LVSTARTUP; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - LocalFree(lpStartup); - - /* set Log On As */ - lvItem.pszText = pServiceConfig->lpServiceStartName; - lvItem.iSubItem = LVLOGONAS; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - HeapFree(ProcessHeap, - 0, - pServiceConfig); + /* fill out all the column data */ + for (i = LVDESC; i <= LVLOGONAS; i++) + { + ChangeListViewText(Info, pService, i); } }

1 0

[gedmurphy] 29501: only run the change code when we have the changed struct to work with.
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Thu Oct 11 16:00:19 2007 New Revision: 29501 URL: http://svn.reactos.org/svn/reactos?rev=29501&view=rev Log: only run the change code when we have the changed struct to work with. Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c 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 Oct 11 16:00:19 2007 @@ -700,9 +700,11 @@ { LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; - ListViewSelectionChanged(Info, pnmv); - SetMenuAndButtonStates(Info); - + if (pnmv->uNewState != 0) + { + ListViewSelectionChanged(Info, pnmv); + SetMenuAndButtonStates(Info); + } } break;

1 0

[gedmurphy] 29500: improve the button states in relation to the service
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Thu Oct 11 15:09:39 2007 New Revision: 29500 URL: http://svn.reactos.org/svn/reactos?rev=29500&view=rev Log: improve the button states in relation to the service Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet.c 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 Oct 11 15:09:39 2007 @@ -151,7 +151,6 @@ VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info) { - LPQUERY_SERVICE_CONFIG lpServiceConfig; HMENU hMainMenu; UINT i; @@ -169,6 +168,9 @@ if (Info->SelectedItem != NO_ITEM_SELECTED) { + LPQUERY_SERVICE_CONFIG lpServiceConfig = NULL; + DWORD Flags, State; + /* allow user to delete service */ if (Info->bIsUserAnAdmin) { @@ -178,14 +180,13 @@ EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_DELETE, MF_ENABLED); } + Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; + State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; + lpServiceConfig = GetServiceConfig(Info->pCurrentService->lpServiceName); + if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) { - DWORD Flags, State; - - Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; - if (State == SERVICE_STOPPED) { EnableMenuItem(hMainMenu, ID_START, MF_ENABLED); @@ -193,23 +194,7 @@ SendMessage(Info->hTool, TB_SETSTATE, ID_START, (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); } - - if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_STOP, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_STOP, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - - if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_PAUSE, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_PAUSE, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) { EnableMenuItem(hMainMenu, ID_RESTART, MF_ENABLED); @@ -219,6 +204,22 @@ } HeapFree(GetProcessHeap(), 0, lpServiceConfig); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_STOP, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_STOP, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_PAUSE, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_PAUSE, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); } } else @@ -396,6 +397,7 @@ Info->bDlgOpen = TRUE; OpenPropSheet(Info); Info->bDlgOpen = FALSE; + SetMenuAndButtonStates(Info); } } break; 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 Oct 11 15:09:39 2007 @@ -60,6 +60,7 @@ UINT HintId; } MENU_HINT, *PMENU_HINT; +VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info); VOID UpdateServiceCount(PMAIN_WND_INFO Info); VOID ChangeListViewText(PMAIN_WND_INFO Info, ENUM_SERVICE_STATUS_PROCESS* pService, UINT Column); BOOL InitMainWindowImpl(VOID); Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Thu Oct 11 15:09:39 2007 @@ -35,26 +35,26 @@ } lpServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName); - if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) - { - if (State == SERVICE_STOPPED) - { - hButton = GetDlgItem(hwndDlg, IDC_START); - EnableWindow (hButton, TRUE); - } - else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_STOP); - EnableWindow (hButton, TRUE); - } - else if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_PAUSE); - EnableWindow (hButton, TRUE); - } - + if (State == SERVICE_STOPPED && + lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) + { + hButton = GetDlgItem(hwndDlg, IDC_START); + EnableWindow (hButton, TRUE); HeapFree(GetProcessHeap(), 0, lpServiceConfig); } + else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndDlg, IDC_STOP); + EnableWindow (hButton, TRUE); + } + else if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndDlg, IDC_PAUSE); + EnableWindow (hButton, TRUE); + } + + /* set the main toolbar */ + SetMenuAndButtonStates(dlgInfo->Info); } @@ -365,6 +365,7 @@ { case PSN_APPLY: SaveDlgInfo(dlgInfo, hwndDlg); + SetButtonStates(dlgInfo, hwndDlg); break; } }

1 0

[janderwald] 29499: Dmitry Timoshkov <dmitry@codeweavers.com> - Switch to using 'long' for INT_PTR type for 64-bit compatibility. Andrew Talbot <Andrew.Talbot@talbotville.com> - Exclude unused headers. Hans Leidekker <hans@it.vu.nl> - Win64 printf format warning fixes. James Hawkins <truiken@gmail.com> - Remove redundant NULL checks before SHFree. Jonathan Ernst <jonathan@ernstfamily.ch> - Update the address of the Free Software Foundation. ------------------------ - readd ReactOS changes (the p
by janderwald＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: janderwald Date: Thu Oct 11 14:48:31 2007 New Revision: 29499 URL: http://svn.reactos.org/svn/reactos?rev=29499&view=rev Log: Dmitry Timoshkov <dmitry(a)codeweavers.com> - Switch to using 'long' for INT_PTR type for 64-bit compatibility. Andrew Talbot <Andrew.Talbot(a)talbotville.com> - Exclude unused headers. Hans Leidekker <hans(a)it.vu.nl> - Win64 printf format warning fixes. James Hawkins <truiken(a)gmail.com> - Remove redundant NULL checks before SHFree. Jonathan Ernst <jonathan(a)ernstfamily.ch> - Update the address of the Free Software Foundation. ------------------------ - readd ReactOS changes (the properties menu item was removed, readd it + code to show properties dialogs) Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Thu Oct 11 14:48:31 2007 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <string.h> @@ -30,7 +30,6 @@ #include "windef.h" #include "wingdi.h" #include "pidl.h" -#include "shlguid.h" #include "undocshell.h" #include "shlobj.h" @@ -38,9 +37,6 @@ #include "shellfolder.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); - -/* ugly hack for cut&psate files */ -BOOL fileMoving = FALSE; /************************************************************************** * IContextMenu Implementation @@ -147,7 +143,7 @@ ItemCmImpl *This = (ItemCmImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -160,7 +156,7 @@ ItemCmImpl *This = (ItemCmImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount + 1); + TRACE("(%p)->(count=%i)\n", This, refCount + 1); if (!refCount) { @@ -169,8 +165,7 @@ if(This->pSFParent) IShellFolder_Release(This->pSFParent); - if(This->pidl) - SHFree(This->pidl); + SHFree(This->pidl); /*make sure the pidl is freed*/ _ILFreeaPidl(This->apidl, This->cidl); @@ -257,13 +252,10 @@ _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, "&Delete", MFS_ENABLED); if(uFlags & CMF_CANRENAME) - { _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, "&Rename", ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); - } _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (FCIDM_SHVIEWLAST)); } @@ -376,8 +368,6 @@ LPSHELLVIEW lpSV; LPDATAOBJECT lpDo; - fileMoving = bCut; - TRACE("(%p)->(wnd=%p,bCut=0x%08x)\n",This, hwnd, bCut); /* get the active IShellView */ @@ -525,7 +515,7 @@ HRESULT hr = E_INVALIDARG; - TRACE("(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); switch(uFlags) { @@ -578,7 +568,7 @@ { ItemCmImpl *This = (ItemCmImpl *)iface; - TRACE("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam); + TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); return E_NOTIMPL; }

1 0

[hpoussin] 29498: Remove unneeded comment (__REACTOS__ is always defined)
by hpoussin＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: hpoussin Date: Thu Oct 11 14:47:25 2007 New Revision: 29498 URL: http://svn.reactos.org/svn/reactos?rev=29498&view=rev Log: Remove unneeded comment (__REACTOS__ is always defined) Modified: trunk/reactos/base/shell/cmd/config.h Modified: trunk/reactos/base/shell/cmd/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/config.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/config.h (original) +++ trunk/reactos/base/shell/cmd/config.h Thu Oct 11 14:47:25 2007 @@ -8,9 +8,6 @@ * started. * */ - -/* Define only if used under ReactOS */ -//#define __REACTOS__ #ifndef _CONFIG_H_INCLUDED_ #define _CONFIG_H_INCLUDED_

1 0

[cwittich] 29497: disable redrawing of the ListView window before updating the service list
by cwittich＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: cwittich Date: Thu Oct 11 14:30:43 2007 New Revision: 29497 URL: http://svn.reactos.org/svn/reactos?rev=29497&view=rev Log: disable redrawing of the ListView window before updating the service list 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 Oct 11 14:30:43 2007 @@ -235,6 +235,11 @@ DWORD NumServices; DWORD Index; + SendMessage (Info->hListView, + WM_SETREDRAW, + FALSE, + 0); + (void)ListView_DeleteAllItems(Info->hListView); if (GetServiceList(Info, &NumServices)) @@ -331,7 +336,7 @@ UpdateServiceCount(Info); } - /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */ + /* turn redraw flag on. */ SendMessage (Info->hListView, WM_SETREDRAW, TRUE,

1 0

[gedmurphy] 29496: a better fix for bug 2519
by gedmurphy＠svn.reactos.org 11 Oct '07

11 Oct '07

Author: gedmurphy Date: Thu Oct 11 14:29:02 2007 New Revision: 29496 URL: http://svn.reactos.org/svn/reactos?rev=29496&view=rev Log: a better fix for bug 2519 Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/propsheet.c 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 Oct 11 14:29:02 2007 @@ -151,8 +151,8 @@ VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info) { + LPQUERY_SERVICE_CONFIG lpServiceConfig; HMENU hMainMenu; - DWORD Flags, State; UINT i; /* get handle to menu */ @@ -178,39 +178,47 @@ EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_DELETE, MF_ENABLED); } - Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; - - if (State == SERVICE_STOPPED) - { - EnableMenuItem(hMainMenu, ID_START, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_START, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_START, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - - if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_STOP, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_STOP, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - - if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_PAUSE, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_PAUSE, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - } - - if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - EnableMenuItem(hMainMenu, ID_RESTART, MF_ENABLED); - EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_RESTART, MF_ENABLED); - SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + lpServiceConfig = GetServiceConfig(Info->pCurrentService->lpServiceName); + if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) + { + DWORD Flags, State; + + Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; + State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; + + if (State == SERVICE_STOPPED) + { + EnableMenuItem(hMainMenu, ID_START, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_START, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_START, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_STOP, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_STOP, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_STOP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_PAUSE, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_PAUSE, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_RESTART, MF_ENABLED); + EnableMenuItem(GetSubMenu(Info->hShortcutMenu, 0), ID_RESTART, MF_ENABLED); + SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + } + + HeapFree(GetProcessHeap(), 0, lpServiceConfig); } } else Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Thu Oct 11 14:29:02 2007 @@ -21,13 +21,12 @@ HWND hwndDlg) { HWND hButton; + LPQUERY_SERVICE_CONFIG lpServiceConfig; DWORD Flags, State; UINT i; - LPQUERY_SERVICE_CONFIG lpServiceConfig; Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted; State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState; - lpServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName); for (i = IDC_START; i <= IDC_RESUME; i++) { @@ -35,26 +34,27 @@ EnableWindow (hButton, FALSE); } - if ( (State == SERVICE_STOPPED) && (lpServiceConfig->dwStartType != SERVICE_DISABLED) ) - { - hButton = GetDlgItem(hwndDlg, IDC_START); - EnableWindow (hButton, TRUE); - } - else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_STOP); - EnableWindow (hButton, TRUE); - } - else if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_PAUSE); - EnableWindow (hButton, TRUE); - } - - HeapFree(ProcessHeap, - 0, - lpServiceConfig); - + lpServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName); + if (lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED) + { + if (State == SERVICE_STOPPED) + { + hButton = GetDlgItem(hwndDlg, IDC_START); + EnableWindow (hButton, TRUE); + } + else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndDlg, IDC_STOP); + EnableWindow (hButton, TRUE); + } + else if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndDlg, IDC_PAUSE); + EnableWindow (hButton, TRUE); + } + + HeapFree(GetProcessHeap(), 0, lpServiceConfig); + } } @@ -492,4 +492,3 @@ return Ret; } -

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