Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 28692: only enable the delete and create service buttons for administrators
by gedmurphy＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: gedmurphy Date: Fri Aug 31 13:27:11 2007 New Revision: 28692 URL: http://svn.reactos.org/svn/reactos?rev=28692&view=rev Log: only enable the delete and create service buttons for administrators Modified: trunk/reactos/base/applications/mscutils/servman/about.c trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/servman/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/about.c (original) +++ trunk/reactos/base/applications/mscutils/servman/about.c Fri Aug 31 13:27:11 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/about.c + * FILE: base/applications/mscutils/servman/about.c * PURPOSE: About dialog box message handler - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -20,28 +20,33 @@ { 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); + } hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); + if (hLicenseEditWnd) + { + LoadString(hInstance, + IDS_LICENSE, + strLicense, + sizeof(strLicense) / sizeof(TCHAR)); - LoadString(hInstance, - IDS_LICENSE, - strLicense, - sizeof(strLicense) / sizeof(TCHAR)); - - SetWindowText(hLicenseEditWnd, - strLicense); + SetWindowText(hLicenseEditWnd, + strLicense); + } return TRUE; @@ -49,7 +54,6 @@ if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Îïðåñíÿâàíå", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Îáðàáîòêà...", ID_EDIT, GRAYED - MENUITEM "Ñúçäàâàíå...", ID_CREATE + MENUITEM "Ñúçäàâàíå...", ID_CREATE, GRAYED MENUITEM "Èçòðèâàíå...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Ñâîéñòâà...", ID_PROP, GRAYED @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Aktualisieren", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Bearbeiten...", ID_EDIT, GRAYED - MENUITEM "Erstellen...", ID_CREATE + MENUITEM "Erstellen...", ID_CREATE, GRAYED MENUITEM "Löschen...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Eigenschaften...", ID_PROP, GRAYED @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Dienst-Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Dienst-Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Refresh", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Create...", ID_CREATE + MENUITEM "Create...", ID_CREATE, GRAYED MENUITEM "Delete...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Properties...", ID_PROP, GRAYED @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc Fri Aug 31 13:27:11 2007 @@ -22,7 +22,7 @@ MENUITEM "Rafraîchir", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Éditer...", ID_EDIT, GRAYED - MENUITEM "Créer...", ID_CREATE + MENUITEM "Créer...", ID_CREATE, GRAYED MENUITEM "Supprimer...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Propriétés...", ID_PROP, GRAYED @@ -69,7 +69,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Gestionnaire de services v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestionnaire de services v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Segarkan", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Buat...", ID_CREATE + MENUITEM "Buat...", ID_CREATE, GRAYED MENUITEM "Hapus...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Properti...", ID_PROP, GRAYED @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Manajer Layanan v0.5.1\nHak Cipta (C) 2005-2007\noleh Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Manajer Layanan v0.8\nHak Cipta (C) 2005-2007\noleh Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Aggiorna", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Modifica...", ID_EDIT, GRAYED - MENUITEM "Crea...", ID_CREATE + MENUITEM "Crea...", ID_CREATE, GRAYED MENUITEM "Cancella...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Proprietà...", ID_PROP, GRAYED @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Gestione Servizi v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestione Servizi v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc Fri Aug 31 13:27:11 2007 @@ -28,7 +28,7 @@ MENUITEM "Odwie¿", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Edycja...", ID_EDIT, GRAYED - MENUITEM "Utwórz...", ID_CREATE + MENUITEM "Utwórz...", ID_CREATE, GRAYED MENUITEM "Usuñ...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "W³aciwoci...", ID_PROP, GRAYED @@ -75,7 +75,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Îáíîâèòü", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Èçìåíèòü...", ID_EDIT, GRAYED - MENUITEM "Ñîçäàòü...", ID_CREATE + MENUITEM "Ñîçäàòü...", ID_CREATE, GRAYED MENUITEM "Óäàëèòü...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Ñâîéñòâà...", ID_PROP, GRAYED @@ -67,7 +67,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Ìåíåäæåð ñëóæá v0.5\nCopyright (C) 2005-2007\nîò Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Ìåíåäæåð ñëóæá v0.8\nCopyright (C) 2005-2007\nîò Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc Fri Aug 31 13:27:11 2007 @@ -30,7 +30,7 @@ MENUITEM "¿×é¹¿Ù", ID_REFRESH MENUITEM SEPARATOR MENUITEM "á¡éä¢...", ID_EDIT, GRAYED - MENUITEM "ÊÃéÒ§...", ID_CREATE + MENUITEM "ÊÃéÒ§...", ID_CREATE, GRAYED MENUITEM "Åº...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "¤Ø³ÊÁºÑµÔ...", ID_PROP, GRAYED @@ -77,7 +77,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "â»Ãá¡ÃÁ¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ ÃØè¹ 0.5.1\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2007\nâ´Â à¡é´ àÁÍÃì¿Õè (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "â»Ãá¡ÃÁ¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ ÃØè¹ 0.8\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2007\nâ´Â à¡é´ àÁÍÃì¿Õè (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "»Ô´", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE 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 Fri Aug 31 13:27:11 2007 @@ -24,7 +24,7 @@ /* Note: First item for a seperator is its width in pixels */ {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - {TBICON_CREATE, ID_CREATE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* create */ + {TBICON_CREATE, ID_CREATE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* create */ {TBICON_DELETE, ID_DELETE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* delete */ {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ @@ -172,10 +172,13 @@ if (Info->SelectedItem != NO_ITEM_SELECTED) { /* allow user to delete service */ - SendMessage(Info->hTool, TB_SETSTATE, ID_DELETE, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - EnableMenuItem(hMainMenu, ID_DELETE, MF_ENABLED); - EnableMenuItem(Info->hShortcutMenu, ID_DELETE, MF_ENABLED); + if (Info->bIsUserAnAdmin) + { + SendMessage(Info->hTool, TB_SETSTATE, ID_DELETE, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + EnableMenuItem(hMainMenu, ID_DELETE, MF_ENABLED); + EnableMenuItem(Info->hShortcutMenu, ID_DELETE, MF_ENABLED); + } Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; @@ -350,6 +353,24 @@ 0); Info->bIsUserAnAdmin = IsUserAnAdmin(); + if (Info->bIsUserAnAdmin) + { + HMENU hMainMenu = GetMenu(Info->hMainWnd); + + SendMessage(Info->hTool, + TB_SETSTATE, + ID_CREATE, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + if (hMainMenu) + { + EnableMenuItem(hMainMenu, + ID_CREATE, + MF_ENABLED); + } + EnableMenuItem(Info->hShortcutMenu, + ID_CREATE, + MF_ENABLED); + } return TRUE; }

1 0

[gedmurphy] 28691: - report successful deletion - refresh service list upon creation
by gedmurphy＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: gedmurphy Date: Fri Aug 31 12:21:47 2007 New Revision: 28691 URL: http://svn.reactos.org/svn/reactos?rev=28691&view=rev Log: - report successful deletion - refresh service list upon creation Modified: trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/resource.h 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 Fri Aug 31 12:21:47 2007 @@ -29,6 +29,20 @@ { if (DeleteService(hSc)) { + LPTSTR lpSuccess; + + /* report success to user */ + if (AllocAndLoadString(&lpSuccess, + hInstance, + IDS_DELETE_SUCCESS)) + { + DisplayString(lpSuccess); + + HeapFree(ProcessHeap, + 0, + lpSuccess); + } + bRet = TRUE; } Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc Fri Aug 31 12:21:47 2007 @@ -218,6 +218,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Óñëóãàòà å óñïåøíî ñúçäàäåíà" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Ïîëåòàòà, îòáåëÿçàíè ñúñ \nçâåçäè÷êà ñà íåàçàäúëæèòåëíè" IDS_DELETE_STOP "Òðÿáâà ðú÷íî äà ñïðåòå óñëóãàòà, ïðåäè äà ÿ èçòðèåòå!" END Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc Fri Aug 31 12:21:47 2007 @@ -214,6 +214,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Dienst wurde erfolgreich erstellt" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Mit einem Sternchen gekennzeichnete Felder sind erforderlich" IDS_DELETE_STOP "Sie müssen den Dienst manuell beenden, bevor er gelöscht werden kann!" END Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc Fri Aug 31 12:21:47 2007 @@ -214,6 +214,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Service Created Succesfully" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" IDS_DELETE_STOP "You must manually stop the service before deleting!" END Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc Fri Aug 31 12:21:47 2007 @@ -218,6 +218,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS essaye de suspendre le service suivant" IDS_PROGRESS_INFO_RESUME "ReactOS essaye de relancer le service suivant" IDS_CREATE_SUCCESS "Service créé" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Les champs marqués d'une astérisque\nasont obligatoires" IDS_DELETE_STOP "Vous devez arrêter le service avant de le supprimer!" END Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc Fri Aug 31 12:21:47 2007 @@ -214,6 +214,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Layanan Dibuat Dengan Sukses" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Field yang ditandai dengan\nbintang adalah mandatori" IDS_DELETE_STOP "Anda harus menghentikan layanan sebelum menghapus!" END Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc Fri Aug 31 12:21:47 2007 @@ -214,6 +214,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Servizio creato regolarmente" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "I campi marcati con un asterisco\nsono obbligatori" IDS_DELETE_STOP "Devi fermare il servizio prima di cancellare!" END Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc Fri Aug 31 12:21:47 2007 @@ -221,6 +221,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Us³uga utworzona pomylnie" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Pole zaznaczone wraz z \ nasterix jest obowi¹zkowy" IDS_DELETE_STOP "Musisz rêcznie zatrzymaæ us³ugê przed usuwaniem!" END Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Fri Aug 31 12:21:47 2007 @@ -213,6 +213,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Ñîçäàíèå ñëóæáû óñïåøíî çàâåðøåíî" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "* = îáÿçàòåëüíûå ïîëÿ" IDS_DELETE_STOP "Âû äîëæíû âðó÷íóþ îñòàíîâèòü ñëóæáó ïåðåä óäàëåíèåì!" END Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc Fri Aug 31 12:21:47 2007 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/lang/th-TH.rc * PURPOSE: Thai resources - * COPYRIGHT: Copyright 2007 Sumath Aowsakulsutthi + * TRANSLATOR: Sumath Aowsakulsutthi * */ @@ -223,6 +223,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Service Created Succesfully" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" IDS_DELETE_STOP "You must manually stop the service before deleting!" END 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 Fri Aug 31 12:21:47 2007 @@ -400,11 +400,15 @@ case ID_CREATE: { - DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_DLG_CREATE), - Info->hMainWnd, - (DLGPROC)CreateDialogProc, - (LPARAM)Info); + INT ret; + + ret = DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_DLG_CREATE), + Info->hMainWnd, + (DLGPROC)CreateDialogProc, + (LPARAM)Info); + if (ret == IDOK) + RefreshServiceList(Info); SetFocus(Info->hListView); } Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/resource.h (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h Fri Aug 31 12:21:47 2007 @@ -162,6 +162,7 @@ #define IDC_DEL_NAME 9002 #define IDC_DEL_DESC 9003 #define IDS_DELETE_STOP 9010 +#define IDS_DELETE_SUCCESS 9011 /* progress bar */

1 0

[gedmurphy] 28690: make the create service code a little more readable and reliable.
by gedmurphy＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: gedmurphy Date: Fri Aug 31 03:06:12 2007 New Revision: 28690 URL: http://svn.reactos.org/svn/reactos?rev=28690&view=rev Log: make the create service code a little more readable and reliable. 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 Fri Aug 31 03:06:12 2007 @@ -27,196 +27,111 @@ { SC_HANDLE hSCManager; SC_HANDLE hSc; - TCHAR Buf[32]; + BOOL bRet = FALSE; /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (hSCManager == NULL) - { - GetError(); - return FALSE; - } - - hSc = CreateService(hSCManager, - Data->ServiceName, - Data->DisplayName, - SERVICE_ALL_ACCESS, - SERVICE_WIN32_OWN_PROCESS, - SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, - Data->BinPath, - NULL, - NULL, - NULL, - NULL, - NULL); - - if (hSc == NULL) - { - GetError(); + if (hSCManager) + { + hSc = CreateService(hSCManager, + Data->ServiceName, + Data->DisplayName, + SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, + Data->BinPath, + NULL, + NULL, + NULL, + NULL, + NULL); + + if (hSc) + { + LPTSTR lpSuccess; + + /* Set the service description as CreateService + does not do this for us */ + SetServiceDescription(Data->ServiceName, + Data->Description); + + /* report success to user */ + if (AllocAndLoadString(&lpSuccess, + hInstance, + IDS_CREATE_SUCCESS)) + { + DisplayString(lpSuccess); + + HeapFree(ProcessHeap, + 0, + lpSuccess); + } + + CloseServiceHandle(hSc); + bRet = TRUE; + } + CloseServiceHandle(hSCManager); - return FALSE; - } - - /* Set the service description as CreateService - does not do this for us */ - SetServiceDescription(Data->ServiceName, - Data->Description); - - /* report success to user */ - LoadString(hInstance, - IDS_CREATE_SUCCESS, - Buf, - sizeof(Buf) / sizeof(TCHAR)); - DisplayString(Buf); - - CloseServiceHandle(hSCManager); - CloseServiceHandle(hSc); - - return TRUE; + } + + return bRet; +} + + +static LPTSTR +GetStringFromDialog(PCREATE_DATA Data, + UINT id) +{ + HWND hwnd; + LPTSTR lpString = NULL; + INT iLen = 0; + + hwnd = GetDlgItem(Data->hSelf, + id); + if (hwnd) + { + iLen = GetWindowTextLength(hwnd); + if (iLen) + { + lpString = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + (iLen + 1) * sizeof(TCHAR)); + if (lpString) + { + GetWindowText(hwnd, + lpString, + iLen + 1); + } + } + } + + return lpString; } static BOOL GetDataFromDialog(PCREATE_DATA Data) { - HWND hwnd; - TCHAR Buf[64]; - INT iLen = 0; - - /* get service name */ - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_SERVNAME); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->ServiceName = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->ServiceName != NULL) - { - GetWindowText(hwnd, - Data->ServiceName, - iLen+1); - } - else - return FALSE; - } - else - { - LoadString(hInstance, - IDS_CREATE_REQ, - Buf, - sizeof(Buf)); - DisplayString(Buf); - SetFocus(hwnd); - return FALSE; - } - - /* get display name */ - iLen = 0; - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_DISPNAME); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->DisplayName = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->DisplayName != NULL) - { - GetWindowText(hwnd, - Data->DisplayName, - iLen+1); - } - else - return FALSE; - } - else - { - LoadString(hInstance, - IDS_CREATE_REQ, - Buf, - sizeof(Buf)); - DisplayString(Buf); - SetFocus(hwnd); - return FALSE; - } - - /* get binary path */ - iLen = 0; - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_PATH); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->BinPath = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->BinPath != NULL) - { - GetWindowText(hwnd, - Data->BinPath, - iLen+1); - } - else - return FALSE; - } - else - { - LoadString(hInstance, - IDS_CREATE_REQ, - Buf, - sizeof(Buf)); - DisplayString(Buf); - SetFocus(hwnd); - return FALSE; - } - - /* get description */ - iLen = 0; - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_DESC); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->Description = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->Description != NULL) - { - GetWindowText(hwnd, - Data->Description, - iLen+1); - } - else - return FALSE; - } - - - /* get options */ - iLen = 0; - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_PATH); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->Options = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->Options != NULL) - { - GetWindowText(hwnd, - Data->Options, - iLen+1); - } - else - return FALSE; - } - - return TRUE; + BOOL bRet = FALSE; + + if ((Data->ServiceName = GetStringFromDialog(Data, IDC_CREATE_SERVNAME))) + { + if ((Data->DisplayName = GetStringFromDialog(Data, IDC_CREATE_DISPNAME))) + { + if ((Data->BinPath = GetStringFromDialog(Data, IDC_CREATE_PATH))) + { + Data->Description = GetStringFromDialog(Data, IDC_CREATE_DESC); + Data->Options = GetStringFromDialog(Data, IDC_CREATE_OPTIONS); + + bRet = TRUE; + } + } + } + + return bRet; } static VOID

1 0

[greatlrd] 28689: implement GetDeviceGammaRamp
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Fri Aug 31 02:20:16 2007 New Revision: 28689 URL: http://svn.reactos.org/svn/reactos?rev=28689&view=rev Log: implement GetDeviceGammaRamp Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Aug 31 02:20:16 2007 @@ -831,19 +831,29 @@ } /* - * @unimplemented - */ -BOOL -STDCALL -GetDeviceGammaRamp( - HDC a0, - LPVOID a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} + * @implemented + */ +BOOL +STDCALL +GetDeviceGammaRamp( HDC hdc, + LPVOID lpGammaRamp) +{ + BOOL retValue = FALSE; + if (lpGammaRamp == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + } + else + { + retValue = NtGdiGetDeviceGammaRamp(hdc,lpGammaRamp); + } + + return retValue; +} + + + + /*

1 0

[greatlrd] 28688: update the good api list
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Fri Aug 31 01:02:45 2007 New Revision: 28688 URL: http://svn.reactos.org/svn/reactos?rev=28688&view=rev Log: update the good api list Modified: trunk/reactos/dll/win32/gdi32/good api.def Modified: trunk/reactos/dll/win32/gdi32/good api.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/good%20api… ============================================================================== --- trunk/reactos/dll/win32/gdi32/good api.def (original) +++ trunk/reactos/dll/win32/gdi32/good api.def Fri Aug 31 01:02:45 2007 @@ -7,7 +7,7 @@ ; if bugs exists their or verify ; -AAddFontResourceA@4 +AddFontResourceA@4 AddFontResourceExA@12 AddFontResourceExW@12 AddFontResourceW@4 @@ -94,6 +94,9 @@ GdiConvertBitmap@4 GdiConvertBrush@4 GdiConvertDC@4 +GdiConvertFont@4 +GdiConvertPalette@4 +GdiConvertRegion@4 GdiDescribePixelFormat@16 GdiEntry16@12=DdSwapTextureHandles@12 GdiFlush@0 @@ -111,5 +114,9 @@ GdiSetServerAttr@8 GdiSwapBuffers@4 GetAspectRatioFilterEx@8 +GetBitmapBits@12 +GetBitmapDimensionEx@8 +GetBoundsRect@12 +

1 0

[greatlrd] 28687: implement : GetBoundsRect remove redirect for follow api for they are need more stuff in user mode GetBkColor, GetBkMode, GetBrushOrgEx, GetCharABCWidthsFloatW
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Fri Aug 31 00:55:31 2007 New Revision: 28687 URL: http://svn.reactos.org/svn/reactos?rev=28687&view=rev Log: implement : GetBoundsRect remove redirect for follow api for they are need more stuff in user mode GetBkColor, GetBkMode, GetBrushOrgEx, GetCharABCWidthsFloatW Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Aug 31 00:55:31 2007 @@ -276,6 +276,18 @@ GdiValidateHandle@4 GetArcDirection@4 GetAspectRatioFilterEx@8 +GetBitmapBits@12=NtGdiGetBitmapBits@12 +GetBitmapDimensionEx@8=NtGdiGetBitmapDimension@8 +GetBkColor@4 +GetBkMode@4 +GetBoundsRect@12 +GetBrushOrgEx@8 +GetCharABCWidthsA@16 +GetCharABCWidthsFloatA@16 +GetCharABCWidthsFloatW@16 +GetCharABCWidthsI@20 + + ClearBitmapAttributes@8 ClearBrushAttributes@8 @@ -337,17 +349,7 @@ DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 GdiDrawStream@12 GetBitmapAttributes@4 -GetBitmapBits@12=NtGdiGetBitmapBits@12 -GetBitmapDimensionEx@8=NtGdiGetBitmapDimension@8 -GetBkColor@4=NtGdiGetBkColor@4 -GetBkMode@4=NtGdiGetBkMode@4 -GetBoundsRect@12 GetBrushAttributes@4 -GetBrushOrgEx@8=NtGdiGetBrushOrgEx@8 -GetCharABCWidthsA@16 -GetCharABCWidthsFloatA@16 -GetCharABCWidthsFloatW@16=NtGdiGetCharABCWidthsFloat@16 -GetCharABCWidthsI@20 GetCharABCWidthsW@16=NtGdiGetCharABCWidths@16 GetCharWidth32A@16 GetCharWidth32W@16=NtGdiGetCharWidth32@16 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Aug 31 00:55:31 2007 @@ -100,19 +100,17 @@ /* - * @unimplemented + * @implemented */ UINT STDCALL GetBoundsRect( - HDC a0, - LPRECT a1, - UINT a2 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + HDC hdc, + LPRECT lprcBounds, + UINT flags + ) +{ + return NtGdiGetBoundsRect(hdc,lprcBounds,flags & DCB_RESET); } @@ -1441,7 +1439,7 @@ } /* - * @unimplemented + * @implemented */ HRGN STDCALL @@ -2783,3 +2781,52 @@ return FALSE; } + +/* + * @implemented + * + */ +COLORREF +STDCALL +GetBkColor(HDC hdc) +{ + /* FIXME some part are done in user mode */ + return NtGdiGetBkColor(hdc); +} + +/* + * @implemented + * + */ +int +STDCALL +GetBkMode(HDC hdc) +{ + /* FIXME some part are done in user mode */ + return NtGdiGetBkMode(hdc); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetBrushOrgEx(HDC hdc,LPPOINT pt) +{ + /* FIXME some part are done in user mode */ + return NtGdiGetBrushOrgEx(hdc,pt); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharABCWidthsFloatW(HDC hdc,UINT FirstChar,UINT LastChar,LPABCFLOAT abcF) +{ + /* FIXME some part are done in user mode */ + return NtGdiGetCharABCWidthsFloat(hdc, FirstChar, LastChar, abcF); +} +

1 0

[greatlrd] 28686: add <define name="LANGPACK" /> should fix the build
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Fri Aug 31 00:18:38 2007 New Revision: 28686 URL: http://svn.reactos.org/svn/reactos?rev=28686&view=rev Log: add <define name="LANGPACK" /> should fix the build Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Fri Aug 31 00:18:38 2007 @@ -9,6 +9,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0501</define> <define name="WINVER">0x600</define> + <define name="LANGPACK" /> <define name="_WIN32K_" /> <pch>w32k.h</pch>

1 0

[greatlrd] 28685: do not hide stub with a DPRINT1 print it
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Fri Aug 31 00:01:59 2007 New Revision: 28685 URL: http://svn.reactos.org/svn/reactos?rev=28685&view=rev Log: do not hide stub with a DPRINT1 print it Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Fri Aug 31 00:01:59 2007 @@ -3288,7 +3288,7 @@ OUT LPRECT prc, IN DWORD f) { - DPRINT("stub"); + DPRINT1("stub"); return DCB_RESET; /* bounding rectangle always empty */ } @@ -3299,7 +3299,7 @@ IN LPRECT prc, IN DWORD f) { - DPRINT("stub"); + DPRINT1("stub"); return DCB_DISABLE; /* bounding rectangle always empty */ }

1 0

[peterw] 28684: French translations by Pierre Schweitzer (see bug 2618): - Translation for win32csr. - Fix two mistakes in the servman translation.
by peterw＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: peterw Date: Thu Aug 30 23:56:50 2007 New Revision: 28684 URL: http://svn.reactos.org/svn/reactos?rev=28684&view=rev Log: French translations by Pierre Schweitzer (see bug 2618): - Translation for win32csr. - Fix two mistakes in the servman translation. Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc Thu Aug 30 23:56:50 2007 @@ -215,8 +215,8 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS essaye de démarrer le service suivant" IDS_PROGRESS_INFO_STOP "ReactOS essaye d'arrêter le service suivant" - IDS_PROGRESS_INFO_PAUSE "ReactOS essaye de suspendre le service suivan" - IDS_PROGRESS_INFO_RESUME "ReactOS essaye de relancer le service suivan" + IDS_PROGRESS_INFO_PAUSE "ReactOS essaye de suspendre le service suivant" + IDS_PROGRESS_INFO_RESUME "ReactOS essaye de relancer le service suivant" IDS_CREATE_SUCCESS "Service créé" IDS_CREATE_REQ "Les champs marqués d'une astérisque\nasont obligatoires" IDS_DELETE_STOP "Vous devez arrêter le service avant de le supprimer!" Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc Thu Aug 30 23:56:50 2007 @@ -1,0 +1,50 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fin du programme - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Termine le programme... Veuillez patienter",IDC_STATIC,7,7,186,11 + CONTROL "Avancement",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Si vous choisissez de terminer le programme immédiatement, vous perdrez toutes les données non sauvegardées. Pour terminer le programme maintenant, cliquez sur Terminer maintenant.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "T&erminer maintenant",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fin du programme - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Annuler",IDCANCEL,142,98,43,17 + PUSHBUTTON "T&erminer maintenant",IDC_END_NOW,78,98,43,17 + LTEXT "Ce programme ne répond pas",IDC_STATIC,7,7,178,8 + LTEXT "Pour retourner à ReactOS et vérifier l'état du programme, cliquez sur Annuler", + IDC_STATIC,7,26,178,16 + LTEXT "Si vous choisissez de terminer le programme immédiatement, vous perdrez toutes les données non sauvegardées. Pour terminer le programme maintenant, cliquez sur Terminer maintenant", + IDC_STATIC,7,53,178,26 +END + +/* Fixme : Translation could be really improved, with context + La traduction pourrait réellement être améliorée grâce au contexte */ +STRINGTABLE +BEGIN + IDS_EDIT "Éditer" + IDS_MARK "Marquer" + IDS_COPY "Copier\tEntrée" + IDS_PASTE "Coller" + IDS_SELECTALL "Tout sélectionner" + IDS_SCROLL "Défiler" + IDS_FIND "Trouver..." + IDS_DEFAULTS "Défauts" + IDS_PROPERTIES "Proprietés" + IDS_SCROLLHERE "Défiler ici" + IDS_SCROLLTOP "Défiler tout en haut" + IDS_SCROLLBOTTOM "Défiler tout en bas" + IDS_SCROLLPAGE_UP "Page précédente" + IDS_SCROLLPAGE_DOWN "Page suivante" + IDS_SCROLLUP "Défiler en haut" + IDS_SCROLLDOWN "Défiler en bas" +END Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Thu Aug 30 23:56:50 2007 @@ -5,11 +5,12 @@ 1 ICON DISCARDABLE res/terminal.ico +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" +#include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/uk-UA.rc" -#include "lang/ru-RU.rc" -#include "lang/el-GR.rc"

1 0

[greatlrd] 28683: implement stub for NtGdiHT_Get8BPPFormatPalette, NtGdiHT_Get8BPPMaskPalette, NtGdiUpdateTransform, NtGdiSetPUMPDOBJ, NtGdiBRUSHOBJ_DeleteRbrush, NtGdiUMPDEngFreeUserMem, NtGdiDrawStream
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Thu Aug 30 23:35:59 2007 New Revision: 28683 URL: http://svn.reactos.org/svn/reactos?rev=28683&view=rev Log: implement stub for NtGdiHT_Get8BPPFormatPalette, NtGdiHT_Get8BPPMaskPalette, NtGdiUpdateTransform, NtGdiSetPUMPDOBJ, NtGdiBRUSHOBJ_DeleteRbrush, NtGdiUMPDEngFreeUserMem, NtGdiDrawStream Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db 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 Thu Aug 30 23:35:59 2007 @@ -2760,3 +2760,97 @@ return FALSE; } + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiDrawStream( + IN HDC hdcDst, + IN ULONG cjIn, + IN VOID *pvIn) +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +BOOL +NtGdiUMPDEngFreeUserMem( + IN KERNEL_PVOID *ppv) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +NtGdiBRUSHOBJ_DeleteRbrush( + IN BRUSHOBJ *pbo, + IN BRUSHOBJ *pboB) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +NtGdiSetPUMPDOBJ( + IN HUMPD humpd, + IN BOOL bStoreID, + OUT HUMPD *phumpd, + OUT BOOL *pbWOW64) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +NtGdiUpdateTransform(IN HDC hdc) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +LONG +STDCALL +NtGdiHT_Get8BPPMaskPalette( + OUT OPTIONAL LPPALETTEENTRY pPaletteEntry, + IN BOOL Use8BPPMaskPal, + IN BYTE CMYMask, + IN USHORT RedGamma, + IN USHORT GreenGamma, + IN USHORT BlueGamma) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +LONG +STDCALL +NtGdiHT_Get8BPPFormatPalette( + OUT OPTIONAL LPPALETTEENTRY pPaletteEntry, + IN USHORT RedGamma, + IN USHORT GreenGamma, + IN USHORT BlueGamma) +{ + UNIMPLEMENTED; + return FALSE; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 30 23:35:59 2007 @@ -666,13 +666,13 @@ # NtGdiPATHOBJ_bEnumClipLines 3 # NtGdiGetDhpdev 1 NtGdiEngCheckAbort 1 -# NtGdiHT_Get8BPPFormatPalette 4 -# NtGdiHT_Get8BPPMaskPalette 6 -# NtGdiUpdateTransform 1 -# NtGdiSetPUMPDOBJ 4 -# NtGdiBRUSHOBJ_DeleteRbrush 2 -# NtGdiUMPDEngFreeUserMem 1 -# NtGdiDrawStream 3 +NtGdiHT_Get8BPPFormatPalette 4 +NtGdiHT_Get8BPPMaskPalette 6 +NtGdiUpdateTransform 1 +NtGdiSetPUMPDOBJ 4 +NtGdiBRUSHOBJ_DeleteRbrush 2 +NtGdiUMPDEngFreeUserMem 1 +NtGdiDrawStream 3 # # # Wrong number of param ?

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