Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 28702: Enable serial output to console in the template for the QEMU package
by cfinck＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: cfinck Date: Fri Aug 31 17:10:24 2007 New Revision: 28702 URL: http://svn.reactos.org/svn/reactos?rev=28702&view=rev Log: Enable serial output to console in the template for the QEMU package Modified: trunk/tools/VM-Templates/QEMU/boot.bat Modified: trunk/tools/VM-Templates/QEMU/boot.bat URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/boot.bat?r… ============================================================================== --- trunk/tools/VM-Templates/QEMU/boot.bat (original) +++ trunk/tools/VM-Templates/QEMU/boot.bat Fri Aug 31 17:10:24 2007 @@ -1,2 +1,2 @@ @echo off -qemu -L . -m 128 -hda ReactOS.vmdk +qemu -L . -m 128 -hda ReactOS.vmdk -serial file:CON

1 0

[greatlrd] 28701: Update the good api list
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 16:32:40 2007 New Revision: 28701 URL: http://svn.reactos.org/svn/reactos?rev=28701&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 16:32:40 2007 @@ -117,6 +117,13 @@ GetBitmapBits@12 GetBitmapDimensionEx@8 GetBoundsRect@12 +GetCharWidthInfo@8 +GetColorAdjustment@8 +GetDCOrgEx@8 +GetDeviceGammaRamp@8 +GetEUDCTimeStamp@0 +GetEUDCTimeStampExW@4 +

1 0

[greatlrd] 28700: implement GetEUDCTimeStampExW but still unimplement in win32k
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 16:16:45 2007 New Revision: 28700 URL: http://svn.reactos.org/svn/reactos?rev=28700&view=rev Log: implement GetEUDCTimeStampExW but still unimplement in win32k Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Fri Aug 31 16:16:45 2007 @@ -262,15 +262,24 @@ /* - * @unimplemented + * @implemented */ DWORD STDCALL -GetEUDCTimeStampExW(LPCWSTR str) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetEUDCTimeStampExW(LPWSTR lpBaseFaceName) +{ + DWORD retValue = 0; + + if (!lpBaseFaceName) + { + retValue = NtGdiGetEudcTimeStampEx(NULL,0,FALSE); + } + else + { + retValue = NtGdiGetEudcTimeStampEx(lpBaseFaceName, wcslen(lpBaseFaceName), FALSE); + } + + return retValue; } /*

1 0

[hpoussin] 28699: Fix build
by hpoussin＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: hpoussin Date: Fri Aug 31 15:38:51 2007 New Revision: 28699 URL: http://svn.reactos.org/svn/reactos?rev=28699&view=rev Log: Fix build Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Fri Aug 31 15:38:51 2007 @@ -216,7 +216,7 @@ @ stdcall InstallHinfSectionW(long long wstr long) @ stub InstallStop @ stub InstallStopEx -@ stdcall IsUserAdmin=shell32.IsUserAnAdmin() +@ stdcall IsUserAdmin() shell32.IsUserAnAdmin @ stub LookUpStringInTable @ stub MemoryInitialize @ stdcall MultiByteToUnicode(str long)

1 0

[greatlrd] 28698: revert back the typo change I did in AddFontResourceExW
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 15:36:44 2007 New Revision: 28698 URL: http://svn.reactos.org/svn/reactos?rev=28698&view=rev Log: revert back the typo change I did in AddFontResourceExW Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Fri Aug 31 15:36:44 2007 @@ -1093,7 +1093,7 @@ { int retVal = 0; - if (!(fl & (FR_PRIVATE | FR_NOT_ENUM))) + if (fl & (FR_PRIVATE | FR_NOT_ENUM)) { retVal = GdiAddFontResourceW(lpszFilename, fl,0); }

1 0

[greatlrd] 28697: Fix typo in : AddFontResourceExW Redirect : GetColorAdjustment, GetCharWidthInfo to win32k.sys implement : GetEUDCTimeStamp add smaller code in user mode : GetDeviceCaps, GetCurrentPositionEx, GetCurrentObject, GetClipBox, GetCharWidthFloatW, GetCharWidth32W, GetCharABCWidths
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 15:28:45 2007 New Revision: 28697 URL: http://svn.reactos.org/svn/reactos?rev=28697&view=rev Log: Fix typo in : AddFontResourceExW Redirect : GetColorAdjustment, GetCharWidthInfo to win32k.sys implement : GetEUDCTimeStamp add smaller code in user mode : GetDeviceCaps, GetCurrentPositionEx, GetCurrentObject, GetClipBox, GetCharWidthFloatW, GetCharWidth32W, GetCharABCWidths Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/font.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 15:28:45 2007 @@ -286,7 +286,36 @@ GetCharABCWidthsFloatA@16 GetCharABCWidthsFloatW@16 GetCharABCWidthsI@20 - +GetCharABCWidthsW@16 +GetCharWidth32A@16 +GetCharWidth32W@16 +GetCharWidthA@16 +GetCharWidthFloatA@16 +GetCharWidthFloatW@16 +GetCharWidthI@20 +GetCharWidthInfo@8=NtGdiGetCharWidthInfo@8 +GetCharWidthW@16 +GetCharacterPlacementA@24 +GetCharacterPlacementW@24 +GetClipBox@8 +GetClipRgn@8 +GetColorAdjustment@8=NtGdiGetColorAdjustment@8 +GetColorSpace@4 +GetCurrentObject@8 +GetCurrentPositionEx@8 +GetDCBrushColor@4 +GetDCOrgEx@8 +GetDCPenColor@4 +GetDIBColorTable@16 +GetDIBits@28 +GetDeviceCaps@8 +GetDeviceGammaRamp@8 +GetETM@8 +GetEUDCTimeStamp@0 +GetEUDCTimeStampExW@4 +GetEnhMetaFileA@4 +GetEnhMetaFileBits@12 +GetEnhMetaFileDescriptionA@12 ClearBitmapAttributes@8 @@ -350,41 +379,11 @@ GdiDrawStream@12 GetBitmapAttributes@4 GetBrushAttributes@4 -GetCharABCWidthsW@16=NtGdiGetCharABCWidths@16 -GetCharWidth32A@16 -GetCharWidth32W@16=NtGdiGetCharWidth32@16 -GetCharWidthA@16 -GetCharWidthFloatA@16 -GetCharWidthFloatW@16=NtGdiGetCharWidthFloat@16 -GetCharWidthI@20 -GetCharWidthInfo@8 -GetCharWidthW@16 -GetCharacterPlacementA@24 -GetCharacterPlacementW@24 -GetClipBox@8=NtGdiGetClipBox@8 -GetClipRgn@8 -GetColorAdjustment@8 -GetColorSpace@4 -GetCurrentObject@8=NtGdiGetCurrentObject@8 -GetCurrentPositionEx@8=NtGdiGetCurrentPositionEx@8 -GetDCBrushColor@4 -GetDCOrgEx@8 -GetDCPenColor@4 -GetDIBColorTable@16 -GetDIBits@28 -GetDeviceCaps@8=NtGdiGetDeviceCaps@8 -GetDeviceGammaRamp@8 -GetEnhMetaFileA@4 -GetEnhMetaFileBits@12 -GetEnhMetaFileDescriptionA@12 GetEnhMetaFileDescriptionW@12 GetEnhMetaFileHeader@12 GetEnhMetaFilePaletteEntries@12 GetEnhMetaFilePixelFormat@12 GetEnhMetaFileW@4 -GetETM@8 -GetEUDCTimeStamp@0 -GetEUDCTimeStampExW@4 GetFontAssocStatus@4 GetFontData@20=NtGdiGetFontData@20 GetFontLanguageInfo@4 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 15:28:45 2007 @@ -609,20 +609,7 @@ } -/* - * @unimplemented - */ -BOOL -STDCALL -GetColorAdjustment( - HDC hdc, - LPCOLORADJUSTMENT a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} + /* @@ -1435,7 +1422,7 @@ STDCALL GdiConvertFont(HFONT hfont) { - return hfont; + return hfont; } /* @@ -1445,7 +1432,7 @@ STDCALL GdiConvertPalette(HPALETTE hpal) { - return hpal; + return hpal; } /* @@ -1455,7 +1442,7 @@ STDCALL GdiConvertRegion(HRGN hregion) { - return hregion; + return hregion; } /* @@ -1692,15 +1679,13 @@ } /* - * @unimplemented + * @implemented */ ULONG STDCALL GetEUDCTimeStamp(VOID) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return NtGdiGetEudcTimeStampEx(NULL,0,TRUE); } /* @@ -2002,17 +1987,7 @@ return 0; } -/* - * @unimplemented - */ -BOOL -STDCALL -GetCharWidthInfo(HDC hdc,PCHWIDTHINFO pChWidthInfo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented @@ -2840,3 +2815,100 @@ return NtGdiGetCharABCWidthsFloat(hdc, FirstChar, LastChar, abcF); } +/* + * @implemented + * + */ +int +STDCALL +GetDeviceCaps(HDC hdc, + int i) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetDeviceCaps(hdc,i); +} + + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCurrentPositionEx(HDC hdc, + LPPOINT lpPoint) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCurrentPositionEx(hdc, lpPoint); +} + +/* + * @implemented + * + */ +HGDIOBJ +STDCALL +GetCurrentObject(HDC hdc, + UINT uObjectType) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCurrentObject(hdc, uObjectType); +} + +/* + * @implemented + * + */ +int +STDCALL +GetClipBox(HDC hdc, + LPRECT lprc) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetClipBox(hdc, lprc); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharWidthFloatW(HDC hdc, + UINT iFirstChar, + UINT iLastChar, + PFLOAT pxBuffer) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCharWidthFloat(hdc, iFirstChar, iLastChar, pxBuffer); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharWidth32W(HDC hdc, + UINT iFirstChar, + UINT iLastChar, + LPINT lpBuffer) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharABCWidths(HDC hdc, + UINT uFirstChar, + UINT uLastChar, + LPABC lpabc) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCharABCWidths(hdc, uFirstChar, uLastChar, lpabc); +} Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Fri Aug 31 15:28:45 2007 @@ -1093,7 +1093,7 @@ { int retVal = 0; - if (fl & (FR_PRIVATE | FR_NOT_ENUM)) + if (!(fl & (FR_PRIVATE | FR_NOT_ENUM))) { retVal = GdiAddFontResourceW(lpszFilename, fl,0); } @@ -1170,7 +1170,7 @@ STDCALL AddFontResourceW ( LPCWSTR lpszFilename ) { - return GdiAddFontResourceW ( lpszFilename, 0, 0 ); + return GdiAddFontResourceW ( lpszFilename, 0, 0 ); }

1 0

[gedmurphy] 28696: not sure how/why I copied the number instead of the id
by gedmurphy＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: gedmurphy Date: Fri Aug 31 15:08:26 2007 New Revision: 28696 URL: http://svn.reactos.org/svn/reactos?rev=28696&view=rev Log: not sure how/why I copied the number instead of the id Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c 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 Fri Aug 31 15:08:26 2007 @@ -27,7 +27,7 @@ Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted; State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState; - for (i = IDC_START; i <= 10104; i++) + for (i = IDC_START; i <= IDC_RESUME; i++) { hButton = GetDlgItem(hwndDlg, i); EnableWindow (hButton, FALSE);

1 0

[gedmurphy] 28695: fix controlling a service from the properties dialog and update the listview accordingly
by gedmurphy＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: gedmurphy Date: Fri Aug 31 15:03:29 2007 New Revision: 28695 URL: http://svn.reactos.org/svn/reactos?rev=28695&view=rev Log: fix controlling a service from the properties dialog and update the listview accordingly Modified: trunk/reactos/base/applications/mscutils/servman/misc.c trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/resource.h Modified: trunk/reactos/base/applications/mscutils/servman/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/misc.c (original) +++ trunk/reactos/base/applications/mscutils/servman/misc.c Fri Aug 31 15:03:29 2007 @@ -3,7 +3,8 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/servman/misc.c * PURPOSE: miscallanous functions - * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.org> + * Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> * */ 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 Fri Aug 31 15:03:29 2007 @@ -22,10 +22,17 @@ { HWND hButton; DWORD Flags, State; + UINT i; Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted; State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState; + for (i = IDC_START; i <= 10104; i++) + { + hButton = GetDlgItem(hwndDlg, i); + EnableWindow (hButton, FALSE); + } + if (State == SERVICE_STOPPED) { hButton = GetDlgItem(hwndDlg, IDC_START); @@ -43,11 +50,37 @@ hButton = GetDlgItem(hwndDlg, IDC_PAUSE); EnableWindow (hButton, TRUE); } - - if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_PAUSE); - EnableWindow (hButton, TRUE); +} + + +static VOID +SetServiceStatusText(PSERVICEPROPSHEET dlgInfo, + HWND hwndDlg) +{ + LPTSTR lpStatus; + UINT id; + + if (dlgInfo->pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + { + id = IDS_SERVICES_STARTED; + } + else + { + id = IDS_SERVICES_STOPPED; + } + + if (AllocAndLoadString(&lpStatus, + hInstance, + id)) + { + SendDlgItemMessage(hwndDlg, + IDC_SERV_STATUS, + WM_SETTEXT, + 0, + (LPARAM)lpStatus); + HeapFree(ProcessHeap, + 0, + lpStatus); } } @@ -159,37 +192,8 @@ /* set startup type */ SetStartupType(dlgInfo->pService->lpServiceName, hwndDlg); - /* set service status */ - if (dlgInfo->pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) - { - TCHAR szServiceStatus[32]; - - LoadString(hInstance, - IDS_SERVICES_STARTED, - szServiceStatus, - _tcslen(szServiceStatus) + 1); - - SendDlgItemMessage(hwndDlg, - IDC_SERV_STATUS, - WM_SETTEXT, - 0, - (LPARAM)szServiceStatus); - } - else - { - TCHAR szServiceStatus[32]; - - LoadString(hInstance, - IDS_SERVICES_STOPPED, - szServiceStatus, - _tcslen(szServiceStatus) + 1); - - SendDlgItemMessage(hwndDlg, - IDC_SERV_STATUS, - WM_SETTEXT, - 0, - (LPARAM)szServiceStatus); - } + SetServiceStatusText(dlgInfo, + hwndDlg); if (dlgInfo->Info->bIsUserAnAdmin) { @@ -292,22 +296,41 @@ case IDC_START: if (DoStart(dlgInfo->Info)) { - //UpdateServiceStatus(dlgInfo->pService); - //ChangeListViewText(dlgInfo, LVSTATUS); - //SetMenuAndButtonStates(Info); + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); } break; case IDC_STOP: - //SendMessage(Info->hMainWnd, WM_COMMAND, ID_STOP, 0); + if (DoStop(dlgInfo->Info)) + { + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); + } break; case IDC_PAUSE: - //SendMessage(Info->hMainWnd, WM_COMMAND, ID_PAUSE, 0); + if (DoPause(dlgInfo->Info)) + { + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); + } break; case IDC_RESUME: - //SendMessage(Info->hMainWnd, WM_COMMAND, ID_RESUME, 0); + if (DoResume(dlgInfo->Info)) + { + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); + } break; case IDC_EDIT: @@ -396,36 +419,6 @@ } -static INT CALLBACK -AddEditButton(HWND hwnd, UINT message, LPARAM lParam) -{ - HWND hEditButton; - - switch (message) - { - case PSCB_PRECREATE: - /*hEditButton = CreateWindowEx(0, - WC_BUTTON, - NULL, - WS_CHILD | WS_VISIBLE, - 20, 300, 30, 15, - hwnd, - NULL, - hInstance, - NULL); - if (hEditButton == NULL) - GetError(0);*/ - - hEditButton = GetDlgItem(hwnd, PSBTN_OK); - DestroyWindow(hEditButton); - //SetWindowText(hEditButton, _T("test")); - - return TRUE; - } - return TRUE; -} - - static VOID InitPropSheetPage(PROPSHEETPAGE *psp, PSERVICEPROPSHEET dlgInfo, @@ -459,7 +452,6 @@ psh.pszCaption = Info->pCurrentService->lpDisplayName; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; - psh.pfnCallback = AddEditButton; psh.ppsp = psp; 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 15:03:29 2007 @@ -121,18 +121,18 @@ /* properties dialog */ #define IDD_DLG_GENERAL 10001 -#define IDC_SERV_NAME 10041 -#define IDC_DISP_NAME 10051 -#define IDC_DESCRIPTION 10061 -#define IDC_EXEPATH 10062 -#define IDC_START_TYPE 10101 -#define IDC_SERV_STATUS 10121 -#define IDC_START 10131 -#define IDC_STOP 10141 -#define IDC_PAUSE 10151 -#define IDC_RESUME 10161 -#define IDC_START_PARAM 10191 -#define IDC_EDIT 10192 +#define IDC_SERV_NAME 10002 +#define IDC_DISP_NAME 10003 +#define IDC_DESCRIPTION 10004 +#define IDC_EXEPATH 10005 +#define IDC_START_TYPE 10006 +#define IDC_SERV_STATUS 10007 +#define IDC_START_PARAM 10008 +#define IDC_EDIT 10009 +#define IDC_START 10101 +#define IDC_STOP 10102 +#define IDC_PAUSE 10103 +#define IDC_RESUME 10104 /* dependancies dialog */ #define IDD_DLG_DEPEND 20001

1 0

[dreimer] 28694: Update the German Translation of Ged's Service Manager.
by dreimer＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: dreimer Date: Fri Aug 31 13:54:27 2007 New Revision: 28694 URL: http://svn.reactos.org/svn/reactos?rev=28694&view=rev Log: Update the German Translation of Ged's Service Manager. Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc 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:54:27 2007 @@ -211,10 +211,10 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS versucht den folgenden Dienst zu starten" IDS_PROGRESS_INFO_STOP "ReactOS versucht den folgenden Dienst zu beenden" - 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_PROGRESS_INFO_PAUSE "ReactOS versucht den folgenden Dienst zu pausieren" + IDS_PROGRESS_INFO_RESUME "ReactOS versucht den folgenden Dienst fortzusetzen" + IDS_CREATE_SUCCESS "Der Dienst wurde erfolgreich erstellt" + IDS_DELETE_SUCCESS "Der Dienst wurde erfolgreich gelöscht" 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

1 0

[hpoussin] 28693: Implement IsUserAnAdmin(), by copying implementation of IsUserAdmin() in setupapi (was implemented by Eric Kohl) Redirect setupapi.IsUserAdmin to shell32.IsUserAnAdmin
by hpoussin＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: hpoussin Date: Fri Aug 31 13:49:48 2007 New Revision: 28693 URL: http://svn.reactos.org/svn/reactos?rev=28693&view=rev Log: Implement IsUserAnAdmin(), by copying implementation of IsUserAdmin() in setupapi (was implemented by Eric Kohl) Redirect setupapi.IsUserAdmin to shell32.IsUserAnAdmin Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Fri Aug 31 13:49:48 2007 @@ -135,7 +135,7 @@ if (!PnpGetLocalHandles(&BindingHandle, NULL)) return CR_FAILURE; - bAdmin = IsUserAdmin(); + bAdmin = IsUserAnAdmin(); for (i = 0; i < 30; i++) { @@ -182,7 +182,7 @@ FIXME("%p %p %lu %lx %p\n", plcLogConf, dnDevInst, Priority, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (plcLogConf == NULL) @@ -298,7 +298,7 @@ TRACE("%p %s %lx %p\n", dnDevInst, debugstr_w(pszID), ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -490,7 +490,7 @@ FIXME("%p %s %p %lx %p\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (pdnDevInst == NULL) @@ -637,7 +637,7 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -725,7 +725,7 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -961,7 +961,7 @@ TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed; @@ -2707,7 +2707,7 @@ FIXME("%lx %lx %lx %lx\n", dnFromDevInst, dnToDevInst, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnFromDevInst == 0 || dnToDevInst == 0) @@ -3051,7 +3051,7 @@ TRACE("%lx %lx\n", ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (ulFlags & ~CM_DETECT_BITS) @@ -3525,7 +3525,7 @@ FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c (original) +++ trunk/reactos/dll/win32/setupapi/misc.c Fri Aug 31 13:49:48 2007 @@ -246,84 +246,6 @@ MyFree(*lpData); return lError; -} - - -/************************************************************************** - * IsUserAdmin [SETUPAPI.@] - * - * Checks whether the current user is a member of the Administrators group. - * - * PARAMS - * None - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI IsUserAdmin(VOID) -{ - SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; - HANDLE hToken; - DWORD dwSize; - PTOKEN_GROUPS lpGroups; - PSID lpSid; - DWORD i; - BOOL bResult = FALSE; - - TRACE("\n"); - - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) - { - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - CloseHandle(hToken); - return FALSE; - } - } - - lpGroups = MyMalloc(dwSize); - if (lpGroups == NULL) - { - CloseHandle(hToken); - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) - { - MyFree(lpGroups); - CloseHandle(hToken); - return FALSE; - } - - CloseHandle(hToken); - - if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, - &lpSid)) - { - MyFree(lpGroups); - return FALSE; - } - - for (i = 0; i < lpGroups->GroupCount; i++) - { - if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) - { - bResult = TRUE; - break; - } - } - - FreeSid(lpSid); - MyFree(lpGroups); - - return bResult; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Fri Aug 31 13:49:48 2007 @@ -216,7 +216,7 @@ @ stdcall InstallHinfSectionW(long long wstr long) @ stub InstallStop @ stub InstallStopEx -@ stdcall IsUserAdmin() +@ stdcall IsUserAdmin=shell32.IsUserAnAdmin() @ stub LookUpStringInTable @ stub MemoryInitialize @ stdcall MultiByteToUnicode(str long) Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Fri Aug 31 13:49:48 2007 @@ -1227,10 +1227,78 @@ /************************************************************************* * IsUserAnAdmin [SHELL32.680] NT 4.0 * + * Checks whether the current user is a member of the Administrators group. + * + * PARAMS + * None + * + * RETURNS + * Success: TRUE + * Failure: FALSE */ BOOL WINAPI IsUserAnAdmin(VOID) -{ FIXME("stub\n"); - return TRUE; +{ + SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; + HANDLE hToken; + DWORD dwSize; + PTOKEN_GROUPS lpGroups; + PSID lpSid; + DWORD i; + BOOL bResult = FALSE; + + TRACE("\n"); + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + CloseHandle(hToken); + return FALSE; + } + } + + lpGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (lpGroups == NULL) + { + CloseHandle(hToken); + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + + if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &lpSid)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + return FALSE; + } + + for (i = 0; i < lpGroups->GroupCount; i++) + { + if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) + { + bResult = TRUE; + break; + } + } + + FreeSid(lpSid); + HeapFree(GetProcessHeap(), 0, lpGroups); + + return bResult; } /*************************************************************************

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