Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 40726: - Implement a special "debug pool" allocator which catches pool overruns. It evolved from an initial patch by Art Yerkes, and is fully independent from underlying pool implementation. It supports only non-paged pool and detects only overruns now. To enable, uncomment DEBUG_NPOOL define in mm/pool.c.
by fireball＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: fireball Date: Wed Apr 29 13:41:32 2009 New Revision: 40726 URL: http://svn.reactos.org/svn/reactos?rev=40726&view=rev Log: - Implement a special "debug pool" allocator which catches pool overruns. It evolved from an initial patch by Art Yerkes, and is fully independent from underlying pool implementation. It supports only non-paged pool and detects only overruns now. To enable, uncomment DEBUG_NPOOL define in mm/pool.c. Added: trunk/reactos/ntoskrnl/mm/dbgpool.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Apr 29 13:41:32 2009 @@ -558,6 +558,24 @@ NTAPI ExFreePagedPool(IN PVOID Block); +BOOLEAN +NTAPI +ExpIsPoolTagDebuggable(ULONG Tag); + +PVOID +NTAPI +ExpAllocateDebugPool( + POOL_TYPE Type, + ULONG Size, + ULONG Tag, + PVOID Caller, + BOOLEAN EndOfPage +); + +VOID +NTAPI +ExpFreeDebugPool(PVOID Block); + VOID NTAPI MmInitializePagedPool(VOID); Added: trunk/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/dbgpool.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/dbgpool.c (added) +++ trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] Wed Apr 29 13:41:32 2009 @@ -1,0 +1,117 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/mm/dbgpool.c + * PURPOSE: Debug version of a pool allocator + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS **************************************************************/ + +typedef struct _EI_WHOLE_PAGE_HEADER { + PVOID ActualAddress; + ULONG Size; + ULONG Tag; +} EI_WHOLE_PAGE_HEADER, *PEI_WHOLE_PAGE_HEADER; + +BOOLEAN +NTAPI +ExpIsPoolTagDebuggable(ULONG Tag) +{ + if (Tag == TAG('C', 'a', 'l', 'l')) return FALSE; + if (Tag == TAG('D', 'r', 'i', 'v')) return FALSE; + if (Tag == TAG('D', 'e', 'v', 'i')) return FALSE; + if (Tag == TAG('A', 'd', 'a', 'p')) return FALSE; + + return FALSE;//TRUE; +} + + +PVOID +NTAPI +ExpAllocateDebugPool(POOL_TYPE Type, ULONG Size, ULONG Tag, PVOID Caller, BOOLEAN EndOfPage) +{ + ULONG UserSize = Size + sizeof(EI_WHOLE_PAGE_HEADER); + ULONG TotalSize = UserSize + 2*PAGE_SIZE; + ULONG_PTR UserData, GuardArea; + PEI_WHOLE_PAGE_HEADER Header; + ULONG_PTR Buffer; + + /* Right now we support only end-of-page allocations */ + ASSERT(EndOfPage); + + /* Allocate space using default routine */ + if (Type & PAGED_POOL_MASK) + { + Buffer = (ULONG_PTR) + ExAllocatePagedPoolWithTag(Type, TotalSize, Tag); + } + else + { + Buffer = (ULONG_PTR) + ExAllocateNonPagedPoolWithTag(Type, TotalSize, Tag, Caller); + } + + /* If allocation failed - fail too */ + if (!Buffer) + { + DPRINT1("A big problem! Pool allocation failed!\n"); + return NULL; + } + + /* Calculate guard area as placed on a page boundary + * at the end of allocated area */ + GuardArea = PAGE_ROUND_DOWN(Buffer + TotalSize - PAGE_SIZE + 1); + + /* Calculate user data and header pointers */ + UserData = GuardArea - Size; + Header = (PEI_WHOLE_PAGE_HEADER)(UserData - sizeof(EI_WHOLE_PAGE_HEADER)); + + /* Fill out the header */ + Header->ActualAddress = (PVOID)Buffer; + Header->Tag = Tag; + Header->Size = Size; + + /* Protect the guard page */ + MmSetPageProtect(NULL, (PVOID)GuardArea, PAGE_NOACCESS); + + DPRINT1("Allocating whole page block Tag %c%c%c%c, Buffer %p, Header %p, UserData %p, GuardArea %p, Size %d\n", + Tag & 0xFF, (Tag >> 8) & 0xFF, + (Tag >> 16) & 0xFF, (Tag >> 24) & 0xFF, + Buffer, Header, UserData, GuardArea, Size); + + return (PVOID)UserData; +} + +VOID +NTAPI +ExpFreeDebugPool(PVOID Block) +{ + PEI_WHOLE_PAGE_HEADER Header; + PVOID ProtectedPage; + + /* Get pointer to our special header */ + Header = (PEI_WHOLE_PAGE_HEADER) + (((PCHAR)Block) - sizeof(EI_WHOLE_PAGE_HEADER)); + + DPRINT1("Freeing whole page block at %08x (Tag %c%c%c%c, %x Header %x)\n", Block, + Header->Tag & 0xFF, (Header->Tag >> 8) & 0xFF, + (Header->Tag >> 16) & 0xFF, (Header->Tag >> 24) & 0xFF, Header->Tag, Header); + + /* Calculate protected page adresss */ + ProtectedPage = ((PCHAR)Block) + Header->Size; + + /* Unprotect it */ + MmSetPageProtect(NULL, ProtectedPage, PAGE_READWRITE); + + /* Free storage */ + ExFreeNonPagedPool(Header->ActualAddress); +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/dbgpool.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=407… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Wed Apr 29 13:41:32 2009 @@ -14,6 +14,10 @@ #define NDEBUG #include <debug.h> +/* Uncomment to enable pool overruns debugging */ +//#define DEBUG_NPOOL +//#define DEBUG_PPOOL + extern PVOID MiNonPagedPoolStart; extern ULONG MiNonPagedPoolLength; extern ULONG MmTotalPagedPoolQuota; @@ -60,7 +64,12 @@ { if (KeGetCurrentIrql() > DISPATCH_LEVEL) KeBugCheckEx(BAD_POOL_CALLER, 0x08, KeGetCurrentIrql(), PoolType, Tag); - Block = ExAllocateNonPagedPoolWithTag(PoolType, NumberOfBytes, Tag, Caller); +#ifdef DEBUG_NPOOL + if (ExpIsPoolTagDebuggable(Tag)) + Block = ExpAllocateDebugPool(PoolType, NumberOfBytes, Tag, Caller, TRUE); + else +#endif + Block = ExAllocateNonPagedPoolWithTag(PoolType, NumberOfBytes, Tag, Caller); } if ((PoolType & MUST_SUCCEED_POOL_MASK) && !Block) @@ -292,7 +301,12 @@ (ULONG_PTR)Block); /* Free from non-paged pool */ - ExFreeNonPagedPool(Block); +#ifdef DEBUG_NPOOL + if (ExpIsPoolTagDebuggable(Tag)) + ExpFreeDebugPool(Block); + else +#endif + ExFreeNonPagedPool(Block); } else { Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Apr 29 13:41:32 2009 @@ -362,6 +362,7 @@ <file>anonmem.c</file> <file>balance.c</file> <file>cont.c</file> + <file>dbgpool.c</file> <file>drvlck.c</file> <file>freelist.c</file> <file>hypermap.c</file>

1 0

[gedmurphy] 40725: - Rewrite start and stop routines to make them much more robust - Add the ability to check for and stop dependent services - Untested at the moment, but unfinished anyway.
by gedmurphy＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: gedmurphy Date: Wed Apr 29 12:32:52 2009 New Revision: 40725 URL: http://svn.reactos.org/svn/reactos?rev=40725&view=rev Log: - Rewrite start and stop routines to make them much more robust - Add the ability to check for and stop dependent services - Untested at the moment, but unfinished anyway. Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/resource.h trunk/reactos/base/applications/mscutils/servman/start.c trunk/reactos/base/applications/mscutils/servman/stop.c 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] Wed Apr 29 12:32:52 2009 @@ -147,6 +147,19 @@ DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 END +IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 +CAPTION "Stop Other Services" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + EDITTEXT IDC_DEL_DESC, 15, 40, 210, 60, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + LTEXT "Do you want to stop these services?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Yes", IDOK, 60, 129, 54, 14 + PUSHBUTTON "No", IDCANCEL, 120, 129, 54, 14 +END + IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 CAPTION "Options" FONT 8, "MS Shell Dlg",0,0 @@ -191,6 +204,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Num Services: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] Wed Apr 29 12:32:52 2009 @@ -174,3 +174,8 @@ #define IDS_PROGRESS_INFO_STOP 7005 #define IDS_PROGRESS_INFO_PAUSE 7006 #define IDS_PROGRESS_INFO_RESUME 7007 + +/* stop dependencies */ +#define IDD_DLG_DEPEND_STOP 12000 +#define IDC_STOP_DEPENDS 12001 +#define IDS_STOP_DEPENDS 12001 Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] Wed Apr 29 12:32:52 2009 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/start.c * PURPOSE: Start a service - * COPYRIGHT: Copyright 2005-2007 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2005-2009 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -14,102 +14,100 @@ HWND hProgDlg) { SC_HANDLE hSCManager; - SC_HANDLE hSc; + SC_HANDLE hService; SERVICE_STATUS_PROCESS ServiceStatus; DWORD BytesNeeded = 0; + DWORD dwStartTickCount; + DWORD dwOldCheckPoint; + DWORD dwWaitTime; + DWORD dwMaxWait; BOOL bRet = FALSE; - BOOL bDispErr = TRUE; - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager != NULL) + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (!hSCManager) { - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_ALL_ACCESS); - if (hSc != NULL) + return FALSE; + } + + hService = OpenServiceW(hSCManager, + Info->pCurrentService->lpServiceName, + SERVICE_START | SERVICE_QUERY_STATUS); + if (hService) + { + bRet = StartServiceW(hService, + 0, + NULL); + if (!bRet && GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) { - if (StartService(hSc, - 0, - NULL)) + bRet = TRUE; + } + else if (bRet) + { + bRet = FALSE; + + if (QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) { - bDispErr = FALSE; + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + dwMaxWait = 30000; // 30 secs - if (QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) + while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) { - DWORD dwStartTickCount = GetTickCount(); - DWORD dwOldCheckPoint = ServiceStatus.dwCheckPoint; - DWORD dwMaxWait = 2000 * 60; // wait for 2 mins + dwWaitTime = ServiceStatus.dwWaitHint / 10; - IncrementProgressBar(hProgDlg); + if (!QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + break; + } - while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) + if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) { - DWORD dwWaitTime = ServiceStatus.dwWaitHint / 10; - - if (!QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) + /* The service is making progress*/ + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + } + else + { + if (GetTickCount() >= dwStartTickCount + dwMaxWait) { + /* We exceeded our max wait time, give up */ break; } + } - if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) - { - /* The service is making progress, increment the progress bar */ - IncrementProgressBar(hProgDlg); - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - } - else - { - if(GetTickCount() >= dwStartTickCount + dwMaxWait) - { - /* give up */ - break; - } - } + if (dwWaitTime < 200) + dwWaitTime = 200; + else if (dwWaitTime > 10000) + dwWaitTime = 10000; - if(dwWaitTime < 200) - dwWaitTime = 200; - else if (dwWaitTime > 10000) - dwWaitTime = 10000; + Sleep(dwWaitTime); + } - Sleep(dwWaitTime); - } + if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) + { + bRet = TRUE; } } - - CloseServiceHandle(hSc); } - CloseServiceHandle(hSCManager); + CloseServiceHandle(hService); } - if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) - { - CompleteProgressBar(hProgDlg); - Sleep(500); - bRet = TRUE; - } - else - { - if (bDispErr) - GetError(); - else - DisplayString(_T("The service failed to start")); - } + CloseServiceHandle(hSCManager); + return bRet; } - BOOL DoStart(PMAIN_WND_INFO Info) @@ -128,8 +126,20 @@ bRet = DoStartService(Info, hProgDlg); + if (bRet) + { + CompleteProgressBar(hProgDlg); + Sleep(500); + bRet = TRUE; + } + else + { + GetError(); + } + DestroyWindow(hProgDlg); } return bRet; } + Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Wed Apr 29 12:32:52 2009 @@ -3,96 +3,366 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/stop.c * PURPOSE: Stops running a service - * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-2009 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" +static BOOL +StopService(PMAIN_WND_INFO pInfo, + SC_HANDLE hService) +{ + SERVICE_STATUS_PROCESS ServiceStatus; + DWORD dwBytesNeeded; + DWORD dwStartTime; + DWORD dwTimeout; + HWND hProgDlg; + BOOL bRet = FALSE; + + dwStartTime = GetTickCount(); + dwTimeout = 30000; // 30 secs + + hProgDlg = CreateProgressDialog(pInfo->hMainWnd, + pInfo->pCurrentService->lpServiceName, + IDS_PROGRESS_INFO_STOP); + if (hProgDlg) + { + IncrementProgressBar(hProgDlg); + + if (ControlService(hService, + SERVICE_CONTROL_STOP, + (LPSERVICE_STATUS)&ServiceStatus)) + { + while (ServiceStatus.dwCurrentState != SERVICE_STOPPED) + { + Sleep(ServiceStatus.dwWaitHint); + + if (QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &dwBytesNeeded)) + { + if (GetTickCount() - dwStartTime > dwTimeout) + { + /* We exceeded our max wait time, give up */ + break; + } + } + } + + if (ServiceStatus.dwCurrentState == SERVICE_STOPPED) + { + bRet = TRUE; + } + } + + CompleteProgressBar(hProgDlg); + Sleep(500); + DestroyWindow(hProgDlg); + } + + return bRet; +} + +static LPENUM_SERVICE_STATUS +GetDependentServices(PMAIN_WND_INFO pInfo, + SC_HANDLE hService, + LPDWORD lpdwCount) +{ + LPENUM_SERVICE_STATUS lpDependencies; + DWORD dwBytesNeeded; + DWORD dwCount; + + if (EnumDependentServices(hService, + SERVICE_ACTIVE, + NULL, + 0, + &dwBytesNeeded, + &dwCount)) + { + /* There are no dependent services */ + return NULL; + } + else + { + if (GetLastError() != ERROR_MORE_DATA) + return NULL; // Unexpected error + + lpDependencies = (LPENUM_SERVICE_STATUS)HeapAlloc(GetProcessHeap(), + 0, + dwBytesNeeded); + if (lpDependencies) + { + if (EnumDependentServices(hService, + SERVICE_ACTIVE, + lpDependencies, + dwBytesNeeded, + &dwBytesNeeded, + &dwCount)) + { + *lpdwCount = dwCount; + } + else + { + HeapFree(ProcessHeap, + 0, + lpDependencies); + + lpDependencies = NULL; + } + } + } + + return lpDependencies; + +} + +static BOOL +StopDependentServices(PMAIN_WND_INFO pInfo, + SC_HANDLE hSCManager, + SC_HANDLE hService) +{ + LPENUM_SERVICE_STATUS lpDependencies; + SC_HANDLE hDepService; + DWORD dwCount; + BOOL bRet = FALSE; + + lpDependencies = GetDependentServices(pInfo, hService, &dwCount); + if (lpDependencies) + { + LPENUM_SERVICE_STATUS lpEnumServiceStatus; + DWORD i; + + for (i = 0; i < dwCount; i++) + { + lpEnumServiceStatus = &lpDependencies[i]; + + hDepService = OpenService(hSCManager, + lpEnumServiceStatus->lpServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS); + if (hDepService) + { + bRet = StopService(pInfo, hDepService); + + CloseServiceHandle(hDepService); + + if (!bRet) + { + GetError(); + break; + } + } + } + + HeapFree(GetProcessHeap(), + 0, + lpDependencies); + } + + return bRet; +} + +static BOOL +HasDependentServices(PMAIN_WND_INFO pInfo) +{ + SC_HANDLE hSCManager; + SC_HANDLE hService; + DWORD dwBytesNeeded, dwCount; + BOOL bRet = FALSE; + + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenServiceW(hSCManager, + pInfo->pCurrentService->lpServiceName, + SERVICE_ENUMERATE_DEPENDENTS); + if (hService) + { + if (!EnumDependentServices(hService, + SERVICE_ACTIVE, + NULL, + 0, + &dwBytesNeeded, + &dwCount)) + { + if (GetLastError() == ERROR_MORE_DATA) + bRet = TRUE; + } + + CloseServiceHandle(hService); + } + + CloseServiceHandle(hSCManager); + } + + return bRet; +} + +static BOOL +DoInitDependsDialog(PMAIN_WND_INFO pInfo, + HWND hDlg) +{ + LPTSTR lpPartialStr, lpStr; + DWORD fullLen; + HICON hIcon = NULL; + BOOL bRet = FALSE; + + if (pInfo) + { + SetWindowLongPtr(hDlg, + GWLP_USERDATA, + (LONG_PTR)pInfo); + + 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); + } + + if (AllocAndLoadString(&lpPartialStr, + hInstance, + IDS_STOP_DEPENDS)) + { + fullLen = _tcslen(lpPartialStr) + _tcslen(pInfo->pCurrentService->lpDisplayName) + 1; + + lpStr = HeapAlloc(ProcessHeap, + 0, + fullLen * sizeof(TCHAR)); + if (lpStr) + { + _sntprintf(lpStr, fullLen, lpPartialStr, pInfo->pCurrentService->lpDisplayName); + + SendDlgItemMessage(hDlg, + IDC_STOP_DEPENDS, + WM_SETTEXT, + 0, + (LPARAM)lpStr); + + bRet = TRUE; + + HeapFree(ProcessHeap, + 0, + lpStr); + } + + HeapFree(ProcessHeap, + 0, + lpPartialStr); + } + } + + return bRet; +} + + +INT_PTR CALLBACK +StopDependsDialogProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo = NULL; + + + /* Get the window context */ + pInfo = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + GWLP_USERDATA); + if (pInfo == NULL && message != WM_INITDIALOG) + { + return FALSE; + } + + switch (message) + { + case WM_INITDIALOG: + { + BOOL bRet = FALSE; + + pInfo = (PMAIN_WND_INFO)lParam; + if (pInfo != NULL) + { + bRet = DoInitDependsDialog(pInfo, hDlg); + } + + return bRet; + } + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + { + EndDialog(hDlg, + LOWORD(wParam)); + return TRUE; + } + } + } + } + + return FALSE; +} + + BOOL -DoStop(PMAIN_WND_INFO Info) +DoStop(PMAIN_WND_INFO pInfo) { SC_HANDLE hSCManager = NULL; - SC_HANDLE hSc = NULL; - LPQUERY_SERVICE_CONFIG lpServiceConfig = NULL; - HWND hProgDlg; - DWORD BytesNeeded = 0; - BOOL ret = FALSE; + SC_HANDLE hService; + BOOL bHasDepends; + BOOL bRet = FALSE; + + bHasDepends = HasDependentServices(pInfo); + if (bHasDepends) + { + INT ret = DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), + pInfo->hMainWnd, + StopDependsDialogProc, + (LPARAM)pInfo); + if (ret != IDOK) + return FALSE; + } hSCManager = OpenSCManager(NULL, NULL, - SC_MANAGER_ENUMERATE_SERVICE); - if (hSCManager == NULL) - { - GetError(); - return FALSE; - } - - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_QUERY_CONFIG); - if (hSc) - { - if (!QueryServiceConfig(hSc, - lpServiceConfig, - 0, - &BytesNeeded)) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - lpServiceConfig = (LPQUERY_SERVICE_CONFIG)HeapAlloc(ProcessHeap, - 0, - BytesNeeded); - if (lpServiceConfig == NULL) - goto cleanup; - - if (QueryServiceConfig(hSc, - lpServiceConfig, - BytesNeeded, - &BytesNeeded)) - { -#if 0 - if (lpServiceConfig->lpDependencies) - { - TCHAR str[500]; - - _sntprintf(str, 499, _T("%s depends on this service, implement the dialog to allow closing of other services"), - lpServiceConfig->lpDependencies); - MessageBox(NULL, str, NULL, 0); - - //FIXME: open 'stop other services' box - } - else - { -#endif - hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->pCurrentService->lpServiceName, - IDS_PROGRESS_INFO_STOP); - if (hProgDlg) - { - ret = Control(Info, - hProgDlg, - SERVICE_CONTROL_STOP); - - DestroyWindow(hProgDlg); - } - //} - - HeapFree(ProcessHeap, - 0, - lpServiceConfig); - - lpServiceConfig = NULL; - } - } - } - } - -cleanup: - if (hSCManager != NULL) + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenService(hSCManager, + pInfo->pCurrentService->lpServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); + if (hService) + { + if (bHasDepends) + { + StopDependentServices(pInfo, + hSCManager, + hService); + } + + bRet = StopService(pInfo, hService); + + CloseServiceHandle(hService); + } + CloseServiceHandle(hSCManager); - if (hSc != NULL) - CloseServiceHandle(hSc); - - return ret; -} + } + + return bRet; +}

1 0

[cgutman] 40724: - Fix build (try 2)
by cgutman＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cgutman Date: Wed Apr 29 02:46:28 2009 New Revision: 40724 URL: http://svn.reactos.org/svn/reactos?rev=40724&view=rev Log: - Fix build (try 2) Modified: trunk/reactos/drivers/network/tcpip/tcpip/buffer.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] Wed Apr 29 02:46:28 2009 @@ -238,7 +238,7 @@ return 0; /* Skip SrcOffset bytes in the source packet */ - NdisGetFirstBufferFromPacket(SrcPacket, &SrcBuffer, &SrcData, &SrcSize, &Total); + NdisGetFirstBufferFromPacket(SrcPacket, &SrcBuffer, (PVOID)&SrcData, &SrcSize, &Total); if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) == -1) return 0; Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Apr 29 02:46:28 2009 @@ -881,7 +881,7 @@ if (NT_SUCCESS(Status)) { - PCHAR DataBuffer; + PVOID DataBuffer; UINT BufferSize; NdisQueryBuffer( (PNDIS_BUFFER)Irp->MdlAddress, @@ -961,7 +961,7 @@ TI_DbgPrint(MID_TRACE,("TCPIP<<< Got an MDL: %x\n", Irp->MdlAddress)); if (NT_SUCCESS(Status)) { - PCHAR Data; + PVOID Data; UINT Len; NdisQueryBuffer( Irp->MdlAddress, &Data, &Len ); @@ -1033,7 +1033,7 @@ (PDRIVER_CANCEL)DispCancelRequest); if (NT_SUCCESS(Status)) { - PCHAR DataBuffer; + PVOID DataBuffer; UINT BufferSize; TI_DbgPrint(MID_TRACE,("About to query buffer %x\n", Irp->MdlAddress));

1 0

[cgutman] 40723: - Fix build
by cgutman＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cgutman Date: Wed Apr 29 02:39:36 2009 New Revision: 40723 URL: http://svn.reactos.org/svn/reactos?rev=40723&view=rev Log: - Fix build Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Apr 29 02:39:36 2009 @@ -103,7 +103,7 @@ while( !IsListEmpty( &Connection->ReceiveRequest ) ) { OSK_UINT RecvLen = 0, Received = 0; - OSK_PCHAR RecvBuffer = 0; + PVOID RecvBuffer = 0; Entry = RemoveHeadList( &Connection->ReceiveRequest ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); @@ -163,7 +163,7 @@ while( !IsListEmpty( &Connection->SendRequest ) ) { OSK_UINT SendLen = 0, Sent = 0; - OSK_PCHAR SendBuffer = 0; + PVOID SendBuffer = 0; Entry = RemoveHeadList( &Connection->SendRequest ); Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); @@ -677,7 +677,7 @@ ULONG ReceiveFlags, PTCP_COMPLETION_ROUTINE Complete, PVOID Context ) { - OSK_PCHAR DataBuffer; + PVOID DataBuffer; UINT DataLen, Received = 0; NTSTATUS Status; PTDI_BUCKET Bucket;

1 0

[cgutman] 40722: - Wait for NdisMFreeSharedMemoryPassive to complete before returning See issue #4428 for more details.
by cgutman＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cgutman Date: Wed Apr 29 02:30:23 2009 New Revision: 40722 URL: http://svn.reactos.org/svn/reactos?rev=40722&view=rev Log: - Wait for NdisMFreeSharedMemoryPassive to complete before returning See issue #4428 for more details. Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/memory.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Wed Apr 29 02:30:23 2009 @@ -71,6 +71,7 @@ BOOLEAN Cached; PNDIS_MINIPORT_BLOCK Adapter; PVOID Context; + PKEVENT Event; } MINIPORT_SHARED_MEMORY, *PMINIPORT_SHARED_MEMORY; /* A structure of WrapperConfigurationContext (not compatible with the Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Wed Apr 29 02:30:23 2009 @@ -181,6 +181,7 @@ */ { PMINIPORT_SHARED_MEMORY Memory = (PMINIPORT_SHARED_MEMORY)Context; + PRKEVENT Event = Memory->Event; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -191,6 +192,10 @@ Memory->VirtualAddress, Memory->Cached); ExFreePool(Memory); + + KeSetEvent(Event, + IO_NO_INCREMENT, + FALSE); } @@ -221,6 +226,7 @@ HANDLE ThreadHandle; PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PMINIPORT_SHARED_MEMORY Memory; + KEVENT Event; NDIS_DbgPrint(MAX_TRACE,("Called.\n")); @@ -234,15 +240,25 @@ NDIS_DbgPrint(MID_TRACE, ("Insufficient resources\n")); return; } + + KeInitializeEvent(&Event, NotificationEvent, FALSE); Memory->AdapterObject = Adapter->NdisMiniportBlock.SystemAdapterObject; Memory->Length = Length; Memory->PhysicalAddress = PhysicalAddress; Memory->VirtualAddress = VirtualAddress; Memory->Cached = Cached; + Memory->Adapter = &Adapter->NdisMiniportBlock; + Memory->Event = &Event; PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, 0, 0, 0, NdisMFreeSharedMemoryPassive, Memory); ZwClose(ThreadHandle); + + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); } VOID

1 0

[cgutman] 40721: - Only call NdisMEthIndicateReceiveComplete once per batch of packets - Slight performance increase
by cgutman＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cgutman Date: Wed Apr 29 02:04:12 2009 New Revision: 40721 URL: http://svn.reactos.org/svn/reactos?rev=40721&view=rev Log: - Only call NdisMEthIndicateReceiveComplete once per batch of packets - Slight performance increase Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Wed Apr 29 02:04:12 2009 @@ -95,6 +95,8 @@ } if(Data & CSR0_RINT) { + BOOLEAN IndicatedData = FALSE; + DPRINT("receive interrupt\n"); while(1) @@ -135,7 +137,8 @@ DPRINT("Indicating a %d-byte packet (index %d)\n", ByteCount, Adapter->CurrentReceiveDescriptorIndex); NdisMEthIndicateReceive(Adapter->MiniportAdapterHandle, 0, Buffer, 14, Buffer+14, ByteCount-14, ByteCount-14); - NdisMEthIndicateReceiveComplete(Adapter->MiniportAdapterHandle); + + IndicatedData = TRUE; RtlZeroMemory(Descriptor, sizeof(RECEIVE_DESCRIPTOR)); Descriptor->RBADR = @@ -148,6 +151,9 @@ Adapter->Statistics.RcvGoodFrames++; } + + if (IndicatedData) + NdisMEthIndicateReceiveComplete(Adapter->MiniportAdapterHandle); } if(Data & CSR0_TINT) {

1 0

[cgutman] 40720: - Remove BINARY_COMPATIBLE concept - We should always use NDIS functions
by cgutman＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cgutman Date: Wed Apr 29 00:42:55 2009 New Revision: 40720 URL: http://svn.reactos.org/svn/reactos?rev=40720&view=rev Log: - Remove BINARY_COMPATIBLE concept - We should always use NDIS functions Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=407… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Wed Apr 29 00:42:55 2009 @@ -70,15 +70,6 @@ #if defined(NDIS51) && !defined(NDIS_PROTOCOL_MAJOR_VERSION) && !defined(NDIS_PROTOCOL_MINOR_VERSION) #define NDIS_PROTOCOL_MAJOR_VERSION 5 #define NDIS_PROTOCOL_MINOR_VERSION 1 -#endif - -#if defined(NDIS_MINIPORT_DRIVER) && !defined(BINARY_COMPATIBLE) -#define BINARY_COMPATIBLE 1 -#endif - -#if !defined(_M_IX86) && BINARY_COMPATIBLE -#undef BINARY_COMPATIBLE -#define BINARY_COMPATIBLE 0 #endif #if 1 @@ -1721,8 +1712,6 @@ NdisFreeBuffer( IN PNDIS_BUFFER Buffer); -#if BINARY_COMPATIBLE - NDISAPI VOID DDKAPI @@ -1755,93 +1744,6 @@ IN PNDIS_BUFFER Buffer, OUT PUINT Offset, OUT PUINT Length); - -#else - -/* - * VOID - * NdisGetBufferPhysicalArraySize( - * IN PNDIS_BUFFER Buffer, - * OUT PUINT ArraySize); - */ -#define NdisGetBufferPhysicalArraySize(Buffer, \ - ArraySize) \ -{ \ - (*(ArraySize) = NDIS_BUFFER_TO_SPAN_PAGES(Buffer)) \ -} - -/* - * VOID - * NdisGetFirstBufferFromPacket( - * IN PNDIS_PACKET _Packet, - * OUT PNDIS_BUFFER * _FirstBuffer, - * OUT PVOID * _FirstBufferVA, - * OUT PUINT _FirstBufferLength, - * OUT PUINT _TotalBufferLength) - */ -#define NdisGetFirstBufferFromPacket(_Packet, \ - _FirstBuffer, \ - _FirstBufferVA, \ - _FirstBufferLength, \ - _TotalBufferLength) \ -{ \ - PNDIS_BUFFER _Buffer; \ - \ - _Buffer = (_Packet)->Private.Head; \ - *(_FirstBuffer) = _Buffer; \ - if (_Buffer != NULL) \ - { \ - *(_FirstBufferVA) = MmGetSystemAddressForMdl(_Buffer); \ - *(_FirstBufferLength) = MmGetMdlByteCount(_Buffer); \ - _Buffer = _Buffer->Next; \ - *(_TotalBufferLength) = *(_FirstBufferLength); \ - while (_Buffer != NULL) { \ - *(_TotalBufferLength) += MmGetMdlByteCount(_Buffer); \ - _Buffer = _Buffer->Next; \ - } \ - } \ - else \ - { \ - *(_FirstBufferVA) = 0; \ - *(_FirstBufferLength) = 0; \ - *(_TotalBufferLength) = 0; \ - } \ -} - -/* - * VOID - * NdisQueryBuffer( - * IN PNDIS_BUFFER Buffer, - * OUT PVOID *VirtualAddress OPTIONAL, - * OUT PUINT Length) - */ -#define NdisQueryBuffer(Buffer, \ - VirtualAddress, \ - Length) \ -{ \ - if (ARGUMENT_PRESENT(VirtualAddress)) \ - *((PVOID*)VirtualAddress) = MmGetSystemAddressForMdl(Buffer); \ - \ - *((PUINT)Length) = MmGetMdlByteCount(Buffer); \ -} - - -/* - * VOID - * NdisQueryBufferOffset( - * IN PNDIS_BUFFER Buffer, - * OUT PUINT Offset, - * OUT PUINT Length); - */ -#define NdisQueryBufferOffset(Buffer, \ - Offset, \ - Length) \ -{ \ - *((PUINT)Offset) = MmGetMdlByteOffset(Buffer); \ - *((PUINT)Length) = MmGetMdlByteCount(Buffer); \ -} - -#endif /* BINARY_COMPATIBLE */ /* * PVOID @@ -2259,8 +2161,6 @@ /* Memory management routines */ -#if BINARY_COMPATIBLE - NDISAPI VOID DDKAPI @@ -2274,29 +2174,6 @@ DDKAPI NdisDestroyLookaheadBufferFromSharedMemory( IN PVOID pLookaheadBuffer); - -#else - -/* - * VOID - * NdisCreateLookaheadBufferFromSharedMemory( - * IN PVOID pSharedMemory, - * IN UINT LookaheadLength, - * OUT PVOID *pLookaheadBuffer) - */ -#define NdisCreateLookaheadBufferFromSharedMemory(_pSharedMemory, \ - _LookaheadLength, \ - _pLookaheadBuffer) \ - ((*(_pLookaheadBuffer)) = (_pSharedMemory)) - -/* - * VOID - * NdisDestroyLookaheadBufferFromSharedMemory( - * IN PVOID pLookaheadBuffer) - */ -#define NdisDestroyLookaheadBufferFromSharedMemory(_pLookaheadBuffer) - -#endif #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM) || defined(_M_PPC) @@ -2654,8 +2531,6 @@ /* Spin lock reoutines */ -#if BINARY_COMPATIBLE - NDISAPI VOID DDKAPI @@ -2691,60 +2566,6 @@ DDKAPI NdisDprReleaseSpinLock( IN PNDIS_SPIN_LOCK SpinLock); - -#else - -/* - * VOID - * NdisAllocateSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisAllocateSpinLock(_SpinLock) \ - KeInitializeSpinLock(&(_SpinLock)->SpinLock) - -/* - * VOID - * NdisFreeSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisFreeSpinLock(_SpinLock) - -/* - * VOID - * NdisAcquireSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisAcquireSpinLock(_SpinLock) \ - KeAcquireSpinLock(&(_SpinLock)->SpinLock, &(_SpinLock)->OldIrql) - -/* - * VOID - * NdisReleaseSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisReleaseSpinLock(_SpinLock) \ - KeReleaseSpinLock(&(_SpinLock)->SpinLock, (_SpinLock)->OldIrql) - -/* - * VOID - * NdisDprAcquireSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisDprAcquireSpinLock(_SpinLock) \ -{ \ - KeAcquireSpinLockAtDpcLevel(&(_SpinLock)->SpinLock); \ - (_SpinLock)->OldIrql = DISPATCH_LEVEL; \ -} - -/* - * VOID - * NdisDprReleaseSpinLock( - * IN PNDIS_SPIN_LOCK SpinLock); - */ -#define NdisDprReleaseSpinLock(_SpinLock) \ - KeReleaseSpinLockFromDpcLevel(&(_SpinLock)->SpinLock) - -#endif /* BINARY_COMPATIBLE */ /* I/O routines */ @@ -3046,24 +2867,11 @@ */ #define NdisStallExecution KeStallExecutionProcessor -#if BINARY_COMPATIBLE - NDISAPI VOID DDKAPI NdisGetCurrentSystemTime( IN PLARGE_INTEGER pSystemTime); - -#else - -/* - * VOID - * NdisGetCurrentSystemTime( - * IN PLARGE_INTEGER pSystemTime); - */ -#define NdisGetCurrentSystemTime KeQuerySystemTime - -#endif NDISAPI CCHAR

1 0

[cwittich] 40719: sync msxml3 with wine 1.1.20
by cwittich＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cwittich Date: Tue Apr 28 23:57:36 2009 New Revision: 40719 URL: http://svn.reactos.org/svn/reactos?rev=40719&view=rev Log: sync msxml3 with wine 1.1.20 Modified: trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/httprequest.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/nodelist.c trunk/reactos/dll/win32/msxml3/nodemap.c trunk/reactos/dll/win32/msxml3/parseerror.c trunk/reactos/dll/win32/msxml3/queryresult.c trunk/reactos/dll/win32/msxml3/schema.c trunk/reactos/dll/win32/msxml3/text.c trunk/reactos/dll/win32/msxml3/xmldoc.c trunk/reactos/dll/win32/msxml3/xmlelem.c trunk/reactos/include/psdk/msxml.idl trunk/reactos/include/psdk/msxml2.idl Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… ============================================================================== --- trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -517,12 +517,12 @@ static HRESULT WINAPI domcdata_get_length( IXMLDOMCDATASection *iface, - long *len) + LONG *len) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; TRACE("%p\n", iface); @@ -543,12 +543,12 @@ static HRESULT WINAPI domcdata_substringData( IXMLDOMCDATASection *iface, - long offset, long count, BSTR *p) + LONG offset, LONG count, BSTR *p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; HRESULT hr = S_FALSE; TRACE("%p\n", iface); @@ -618,14 +618,14 @@ static HRESULT WINAPI domcdata_insertData( IXMLDOMCDATASection *iface, - long offset, BSTR p) + LONG offset, BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pXmlContent; BSTR sNewString; HRESULT hr = S_FALSE; - long nLength = 0, nLengthP = 0; + LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; TRACE("%p\n", This); @@ -688,7 +688,7 @@ static HRESULT WINAPI domcdata_deleteData( IXMLDOMCDATASection *iface, - long offset, long count) + LONG offset, LONG count) { FIXME("\n"); return E_NOTIMPL; @@ -696,7 +696,7 @@ static HRESULT WINAPI domcdata_replaceData( IXMLDOMCDATASection *iface, - long offset, long count, BSTR p) + LONG offset, LONG count, BSTR p) { FIXME("\n"); return E_NOTIMPL; @@ -704,7 +704,7 @@ static HRESULT WINAPI domcdata_splitText( IXMLDOMCDATASection *iface, - long offset, IXMLDOMText **txtNode) + LONG offset, IXMLDOMText **txtNode) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -511,12 +511,12 @@ static HRESULT WINAPI domcomment_get_length( IXMLDOMComment *iface, - long *len) + LONG *len) { domcomment *This = impl_from_IXMLDOMComment( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; TRACE("%p\n", iface); @@ -537,12 +537,12 @@ static HRESULT WINAPI domcomment_substringData( IXMLDOMComment *iface, - long offset, long count, BSTR *p) + LONG offset, LONG count, BSTR *p) { domcomment *This = impl_from_IXMLDOMComment( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; HRESULT hr = S_FALSE; TRACE("%p\n", iface); @@ -626,14 +626,14 @@ static HRESULT WINAPI domcomment_insertData( IXMLDOMComment *iface, - long offset, BSTR p) + LONG offset, BSTR p) { domcomment *This = impl_from_IXMLDOMComment( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pXmlContent; BSTR sNewString; HRESULT hr = S_FALSE; - long nLength = 0, nLengthP = 0; + LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; TRACE("%p\n", This); @@ -696,7 +696,7 @@ static HRESULT WINAPI domcomment_deleteData( IXMLDOMComment *iface, - long offset, long count) + LONG offset, LONG count) { FIXME("\n"); return E_NOTIMPL; @@ -704,7 +704,7 @@ static HRESULT WINAPI domcomment_replaceData( IXMLDOMComment *iface, - long offset, long count, BSTR p) + LONG offset, LONG count, BSTR p) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -1521,7 +1521,7 @@ static HRESULT WINAPI domdoc_get_readyState( IXMLDOMDocument2 *iface, - long* value ) + LONG *value ) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httpreque… ============================================================================== --- trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -213,7 +213,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, long *plStatus) +static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, LONG *plStatus) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); @@ -267,7 +267,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, long *plState) +static HRESULT WINAPI httprequest_get_readyState(IXMLHTTPRequest *iface, LONG *plState) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -388,7 +388,7 @@ if ( !out ) return E_INVALIDARG; - /* if we dont have a doc, use our parent. */ + /* if we don't have a doc, use our parent. */ if(node && !node->doc && node->parent) node->doc = node->parent->doc; Modified: trunk/reactos/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.… ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -198,14 +198,14 @@ static HRESULT WINAPI xmlnodelist_get_item( IXMLDOMNodeList* iface, - long index, + LONG index, IXMLDOMNode** listItem) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); xmlNodePtr curr; - long nodeIndex = 0; - - TRACE("%p %ld\n", This, index); + LONG nodeIndex = 0; + + TRACE("%p %d\n", This, index); if(!listItem) return E_INVALIDARG; @@ -230,11 +230,11 @@ static HRESULT WINAPI xmlnodelist_get_length( IXMLDOMNodeList* iface, - long* listLength) + LONG* listLength) { xmlNodePtr curr; - long nodeCount = 0; + LONG nodeCount = 0; xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); Modified: trunk/reactos/dll/win32/msxml3/nodemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -44,7 +44,7 @@ const struct ISupportErrorInfoVtbl *lpSEIVtbl; LONG ref; IXMLDOMNode *node; - long iterator; + LONG iterator; } xmlnodemap; static inline xmlnodemap *impl_from_IXMLDOMNamedNodeMap( IXMLDOMNamedNodeMap *iface ) @@ -329,15 +329,15 @@ static HRESULT WINAPI xmlnodemap_get_item( IXMLDOMNamedNodeMap *iface, - long index, + LONG index, IXMLDOMNode** listItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlNodePtr node; xmlAttrPtr curr; - long attrIndex; - - TRACE("%p %ld\n", This, index); + LONG attrIndex; + + TRACE("%p %d\n", This, index); *listItem = NULL; @@ -361,12 +361,12 @@ static HRESULT WINAPI xmlnodemap_get_length( IXMLDOMNamedNodeMap *iface, - long* listLength) + LONG *listLength) { xmlNodePtr node; xmlAttrPtr first; xmlAttrPtr curr; - long attrCount; + LONG attrCount; xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); @@ -423,9 +423,9 @@ xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlNodePtr node; xmlAttrPtr curr; - long attrIndex; - - TRACE("%p %ld\n", This, This->iterator); + LONG attrIndex; + + TRACE("%p %d\n", This, This->iterator); *nextItem = NULL; @@ -451,7 +451,7 @@ { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("%p %ld\n", This, This->iterator); + TRACE("%p %d\n", This, This->iterator); This->iterator = 0; Modified: trunk/reactos/dll/win32/msxml3/parseerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/parseerro… ============================================================================== --- trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -191,7 +191,7 @@ static HRESULT WINAPI parseError_get_errorCode( IXMLDOMParseError *iface, - long *code ) + LONG *code ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); TRACE("(%p)->(%p)\n", This, code); @@ -238,7 +238,7 @@ static HRESULT WINAPI parseError_get_line( IXMLDOMParseError *iface, - long *line ) + LONG *line ) { FIXME("\n"); return E_NOTIMPL; @@ -246,7 +246,7 @@ static HRESULT WINAPI parseError_get_linepos( IXMLDOMParseError *iface, - long *linepos ) + LONG *linepos ) { FIXME("\n"); return E_NOTIMPL; @@ -254,7 +254,7 @@ static HRESULT WINAPI parseError_get_filepos( IXMLDOMParseError *iface, - long *filepos ) + LONG *filepos ) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/queryresult.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/queryresu… ============================================================================== --- trunk/reactos/dll/win32/msxml3/queryresult.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/queryresult.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -212,12 +212,12 @@ static HRESULT WINAPI queryresult_get_item( IXMLDOMNodeList* iface, - long index, + LONG index, IXMLDOMNode** listItem) { queryresult *This = impl_from_IXMLDOMNodeList( iface ); - TRACE("%p %ld\n", This, index); + TRACE("%p %d\n", This, index); if(!listItem) return E_INVALIDARG; @@ -235,7 +235,7 @@ static HRESULT WINAPI queryresult_get_length( IXMLDOMNodeList* iface, - long* listLength) + LONG* listLength) { queryresult *This = impl_from_IXMLDOMNodeList( iface ); Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -189,13 +189,13 @@ return E_NOTIMPL; } -static HRESULT WINAPI schema_cache_get_length( IXMLDOMSchemaCollection *iface, long *length ) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI schema_cache_get_namespaceURI( IXMLDOMSchemaCollection *iface, long index, BSTR *len ) +static HRESULT WINAPI schema_cache_get_length( IXMLDOMSchemaCollection *iface, LONG *length ) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI schema_cache_get_namespaceURI( IXMLDOMSchemaCollection *iface, LONG index, BSTR *len ) { FIXME("stub\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -519,12 +519,12 @@ static HRESULT WINAPI domtext_get_length( IXMLDOMText *iface, - long *len) + LONG *len) { domtext *This = impl_from_IXMLDOMText( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; TRACE("%p\n", iface); @@ -545,12 +545,12 @@ static HRESULT WINAPI domtext_substringData( IXMLDOMText *iface, - long offset, long count, BSTR *p) + LONG offset, LONG count, BSTR *p) { domtext *This = impl_from_IXMLDOMText( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pContent; - long nLength = 0; + LONG nLength = 0; HRESULT hr = S_FALSE; TRACE("%p\n", iface); @@ -620,14 +620,14 @@ static HRESULT WINAPI domtext_insertData( IXMLDOMText *iface, - long offset, BSTR p) + LONG offset, BSTR p) { domtext *This = impl_from_IXMLDOMText( iface ); xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); xmlChar *pXmlContent; BSTR sNewString; HRESULT hr = S_FALSE; - long nLength = 0, nLengthP = 0; + LONG nLength = 0, nLengthP = 0; xmlChar *str = NULL; TRACE("%p\n", This); @@ -690,7 +690,7 @@ static HRESULT WINAPI domtext_deleteData( IXMLDOMText *iface, - long offset, long count) + LONG offset, LONG count) { FIXME("\n"); return E_NOTIMPL; @@ -698,7 +698,7 @@ static HRESULT WINAPI domtext_replaceData( IXMLDOMText *iface, - long offset, long count, BSTR p) + LONG offset, LONG count, BSTR p) { FIXME("\n"); return E_NOTIMPL; @@ -706,7 +706,7 @@ static HRESULT WINAPI domtext_splitText( IXMLDOMText *iface, - long offset, IXMLDOMText **txtNode) + LONG offset, IXMLDOMText **txtNode) { FIXME("\n"); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmldoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -419,7 +419,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI xmldoc_get_readyState(IXMLDocument *iface, long *p) +static HRESULT WINAPI xmldoc_get_readyState(IXMLDocument *iface, LONG *p) { FIXME("(%p, %p): stub\n", iface, p); return E_NOTIMPL; @@ -455,7 +455,7 @@ return E_NOTIMPL; } -static xmlElementType type_msxml_to_libxml(long type) +static xmlElementType type_msxml_to_libxml(LONG type) { switch (type) { Modified: trunk/reactos/dll/win32/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlelem.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -333,7 +333,7 @@ return XMLElementCollection_create((IUnknown *)iface, This->node->children, (LPVOID *)p); } -static long type_libxml_to_msxml(xmlElementType type) +static LONG type_libxml_to_msxml(xmlElementType type) { switch (type) { @@ -356,7 +356,7 @@ return XMLELEMTYPE_OTHER; } -static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, long *p) +static HRESULT WINAPI xmlelem_get_type(IXMLElement *iface, LONG *p) { xmlelem *This = impl_from_IXMLElement(iface); @@ -366,7 +366,7 @@ return E_INVALIDARG; *p = type_libxml_to_msxml(This->node->type); - TRACE("returning %ld\n", *p); + TRACE("returning %d\n", *p); return S_OK; } @@ -408,13 +408,13 @@ } static HRESULT WINAPI xmlelem_addChild(IXMLElement *iface, IXMLElement *pChildElem, - long lIndex, long lreserved) + LONG lIndex, LONG lreserved) { xmlelem *This = impl_from_IXMLElement(iface); xmlelem *childElem = impl_from_IXMLElement(pChildElem); xmlNodePtr child; - TRACE("(%p, %p, %ld, %ld)\n", iface, pChildElem, lIndex, lreserved); + TRACE("(%p, %p, %d, %d)\n", iface, pChildElem, lIndex, lreserved); if (lIndex == 0) child = xmlAddChild(This->node, childElem->node); @@ -582,13 +582,13 @@ return E_NOTIMPL; } -static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, long v) -{ - TRACE("(%p, %ld)\n", iface, v); +static HRESULT WINAPI xmlelem_collection_put_length(IXMLElementCollection *iface, LONG v) +{ + TRACE("(%p, %d)\n", iface, v); return E_FAIL; } -static HRESULT WINAPI xmlelem_collection_get_length(IXMLElementCollection *iface, long *p) +static HRESULT WINAPI xmlelem_collection_get_length(IXMLElementCollection *iface, LONG *p) { xmlelem_collection *This = impl_from_IXMLElementCollection(iface); Modified: trunk/reactos/include/psdk/msxml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/msxml.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml.idl [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -37,10 +37,10 @@ interface IXMLElementCollection : IDispatch { [propput, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] - HRESULT length( [in] long v ); + HRESULT length( [in] LONG v ); [propget, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] - HRESULT length( [retval, out] long *p ); + HRESULT length( [retval, out] LONG *p ); [propget, id(DISPID_XMLELEMENTCOLLECTION_NEWENUM)] HRESULT _newEnum( [retval, out] IUnknown ** ppUnk ); @@ -86,7 +86,7 @@ HRESULT children( [retval, out] IXMLElementCollection **p ); [propget, id(DISPID_XMLELEMENT_TYPE)] - HRESULT type( [retval, out] long *p ); + HRESULT type( [retval, out] LONG *p ); [propget, id(DISPID_XMLELEMENT_TEXT)] HRESULT text( [retval, out] BSTR *p ); @@ -97,8 +97,8 @@ [id(DISPID_XMLELEMENT_ADDCHILD)] HRESULT addChild( [in] IXMLElement *pChildElem, - [in] long lIndex, - [in] long lreserved ); + [in] LONG lIndex, + [in] LONG lreserved ); [id(DISPID_XMLELEMENT_REMOVECHILD)] HRESULT removeChild( @@ -134,7 +134,7 @@ HRESULT mimeType( [retval, out] BSTR *p ); [propget, id(DISPID_XMLDOCUMENT_READYSTATE)] - HRESULT readyState( [retval, out] long *p ); + HRESULT readyState( [retval, out] LONG *p ); [propget, id(DISPID_XMLDOCUMENT_CHARSET)] HRESULT charset( [retval, out] BSTR *p ); @@ -191,7 +191,7 @@ HRESULT children([retval, out] IXMLElementCollection **pp); [propget, id(DISPID_XMLELEMENT_TYPE)] - HRESULT type([retval, out] long *plType); + HRESULT type([retval, out] LONG *plType); [propget, id(DISPID_XMLELEMENT_TEXT)] HRESULT text([retval, out] BSTR *p); @@ -202,8 +202,8 @@ [id(DISPID_XMLELEMENT_ADDCHILD)] HRESULT addChild( [in] IXMLElement2 *pChildElem, - [in] long lIndex, - [in] long lReserved); + [in] LONG lIndex, + [in] LONG lReserved); [id(DISPID_XMLELEMENT_REMOVECHILD)] HRESULT removeChild([in]IXMLElement2 *pChildElem); @@ -241,7 +241,7 @@ HRESULT mimeType([retval, out] BSTR *p); [propget, id(DISPID_XMLDOCUMENT_READYSTATE)] - HRESULT readyState([retval, out]long *pl); + HRESULT readyState([retval, out]LONG *pl); [propget, id(DISPID_XMLDOCUMENT_CHARSET)] HRESULT charset([retval, out]BSTR *p); Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… ============================================================================== --- trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msxml2.idl [iso-8859-1] Tue Apr 28 23:57:36 2009 @@ -327,7 +327,7 @@ [retval, out] VARIANT_BOOL *pbool); [propget, id(DISPID_READYSTATE)] - HRESULT readyState([retval, out] long *value); + HRESULT readyState([retval, out] LONG *value); [propget, id(DISPID_XMLDOM_DOCUMENT_PARSEERROR)] HRESULT parseError([retval, out] IXMLDOMParseError **err); @@ -404,10 +404,10 @@ [propget, id(DISPID_XMLDOM_SCHEMACOLLECTION_LENGTH)] HRESULT length( - [retval, out] long *length); + [retval, out] LONG *length); [propget, id(DISPID_VALUE)] - HRESULT namespaceURI([in] long index, [out, retval] BSTR *len); + HRESULT namespaceURI([in] LONG index, [out, retval] BSTR *len); [id(DISPID_XMLDOM_SCHEMACOLLECTION_ADDCOLLECTION)] HRESULT addCollection( @@ -456,10 +456,10 @@ interface IXMLDOMNodeList : IDispatch { [propget, id(DISPID_VALUE)] - HRESULT item([in] long lIndex, [retval, out] IXMLDOMNode **outNode); + HRESULT item([in] LONG lIndex, [retval, out] IXMLDOMNode **outNode); [propget, id(DISPID_DOM_NODELIST_LENGTH)] - HRESULT length([retval, out] long *lLength); + HRESULT length([retval, out] LONG *lLength); [id(DISPID_XMLDOM_NODELIST_NEXTNODE)] HRESULT nextNode( @@ -545,10 +545,10 @@ [retval, out] IXMLDOMNode **outNode); [propget, id(DISPID_VALUE)] - HRESULT item([in] long lIndex, [retval, out] IXMLDOMNode **outNode); + HRESULT item([in] LONG lIndex, [retval, out] IXMLDOMNode **outNode); [propget, id(DISPID_DOM_NODELIST_LENGTH)] - HRESULT length([retval, out] long *lLength); + HRESULT length([retval, out] LONG *lLength); [id(DISPID_XMLDOM_NAMEDNODEMAP_GETQUALIFIEDITEM)] HRESULT getQualifiedItem( @@ -596,12 +596,12 @@ HRESULT data([in] BSTR data); [propget, id(DISPID_DOM_DATA_LENGTH)] - HRESULT length([retval, out] long *len); + HRESULT length([retval, out] LONG *len); [id(DISPID_DOM_DATA_SUBSTRING)] HRESULT substringData( - [in] long offset, - [in] long count, + [in] LONG offset, + [in] LONG count, [retval, out] BSTR *p); [id(DISPID_DOM_DATA_APPEND)] @@ -610,18 +610,18 @@ [id(DISPID_DOM_DATA_INSERT)] HRESULT insertData( - [in] long offset, + [in] LONG offset, [in] BSTR p); [id(DISPID_DOM_DATA_DELETE)] HRESULT deleteData( - [in] long offset, - [in] long count); + [in] LONG offset, + [in] LONG count); [id(DISPID_DOM_DATA_REPLACE)] HRESULT replaceData( - [in] long offset, - [in] long count, + [in] LONG offset, + [in] LONG count, [in] BSTR p); } @@ -699,7 +699,7 @@ { [id(DISPID_DOM_TEXT_SPLITTEXT)] HRESULT splitText( - [in] long offset, + [in] LONG offset, [retval, out] IXMLDOMText **txtNode); } @@ -819,32 +819,32 @@ [id(DISPID_XTLRUNTIME_UNIQUEID)] HRESULT uniqueID( [in]IXMLDOMNode *pNode, - [retval, out]long *pID); + [retval, out]LONG *pID); [id(DISPID_XTLRUNTIME_DEPTH)] HRESULT depth( [in] IXMLDOMNode *pNode, - [retval, out]long * pDepth); + [retval, out]LONG * pDepth); [id(DISPID_XTLRUNTIME_CHILDNUMBER)] HRESULT childNumber( [in]IXMLDOMNode *pNode, - [retval, out] long *pNumber); + [retval, out] LONG *pNumber); [id(DISPID_XTLRUNTIME_ANCESTORCHILDNUMBER)] HRESULT ancestorChildNumber( [in]BSTR bstr, [in]IXMLDOMNode *pNode, - [retval, out]long *pNumber); + [retval, out]LONG *pNumber); [id(DISPID_XTLRUNTIME_ABSOLUTECHILDNUMBER)] HRESULT absoluteChildNumber( [in]IXMLDOMNode *pNode, - [retval, out]long *pNumber); + [retval, out]LONG *pNumber); [id(DISPID_XTLRUNTIME_FORMATINDEX)] HRESULT formatIndex( - [in] long lIndex, + [in] LONG lIndex, [in] BSTR bstr, [retval, out]BSTR *pbstr); @@ -925,7 +925,7 @@ HRESULT reset(); [propget, id(DISPID_XMLDOM_PROCESSOR_READYSTATE)] - HRESULT readyState([retval, out] long *pstate); + HRESULT readyState([retval, out] LONG *pstate); [id(DISPID_XMLDOM_PROCESSOR_ADDPARAMETER)] HRESULT addParameter( @@ -990,7 +990,7 @@ HRESULT abort(); [propget, id(7)] - HRESULT status([out, retval] long *pStatus); + HRESULT status([out, retval] LONG *pStatus); [propget, id(8)] HRESULT statusText([out, retval] BSTR *pStatus); @@ -1008,7 +1008,7 @@ HRESULT responseStream([out, retval] VARIANT *pBody); [propget, id(13)] - HRESULT readyState([out, retval] long *pState); + HRESULT readyState([out, retval] LONG *pState); [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); @@ -1022,7 +1022,7 @@ interface IXMLDOMParseError : IDispatch { [propget, id(DISPID_VALUE)] - HRESULT errorCode([retval, out] long *errCode); + HRESULT errorCode([retval, out] LONG *errCode); [propget, id(DISPID_DOM_ERROR_URL)] HRESULT url([retval, out] BSTR *p); @@ -1034,13 +1034,13 @@ HRESULT srcText([retval, out] BSTR *p); [propget, id(DISPID_DOM_ERROR_LINE)] - HRESULT line([retval, out] long *lineNo); + HRESULT line([retval, out] LONG *lineNo); [propget, id(DISPID_DOM_ERROR_LINEPOS)] - HRESULT linepos([retval, out] long * linePos); + HRESULT linepos([retval, out] LONG * linePos); [propget, id(DISPID_DOM_ERROR_FILEPOS)] - HRESULT filepos([retval, out] long * filePos); + HRESULT filepos([retval, out] LONG * filePos); } [ @@ -1690,21 +1690,21 @@ { [id(DISPID_SAX_ERRORHANDLER_ERROR)] HRESULT error( - [in] IVBSAXLocator * locator, + [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, - [in] long errorCode); + [in] LONG errorCode); [id(DISPID_SAX_ERRORHANDLER_FATALERROR)] HRESULT fatalError( [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, - [in] long errorCode); + [in] LONG errorCode); [id(DISPID_SAX_ERRORHANDLER_IGNORABLEWARNING)] HRESULT ignorableWarning( [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, - [in] long errorCode); + [in] LONG errorCode); }; [

1 0

[dgoette] 395: move compatdb rewrite to his own branch
by dgoette＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: dgoette Date: Tue Apr 28 23:53:35 2009 New Revision: 395 URL: http://svn.reactos.org/svn/reactos?rev=395&view=rev Log: move compatdb rewrite to his own branch Added: branches/compat/ (props changed) - copied from r394, branches/danny-web/www/www.reactos.org/compat/ Removed: branches/danny-web/www/www.reactos.org/compat/ Propchange: branches/compat/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/web/reactos.org/htdocs/compat:288-336,343-346

1 0

[cwittich] 40718: sync cryptui with wine 1.1.20
by cwittich＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: cwittich Date: Tue Apr 28 23:48:23 2009 New Revision: 40718 URL: http://svn.reactos.org/svn/reactos?rev=40718&view=rev Log: sync cryptui with wine 1.1.20 Modified: trunk/reactos/dll/win32/cryptui/main.c Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Tue Apr 28 23:48:23 2009 @@ -3337,7 +3337,7 @@ DWORD size; RECT rc; LVCOLUMNW column; - PurposeSelection purposeSelection; + PurposeSelection purposeSelection = PurposeEnableAll; GetWindowRect(lv, &rc); column.mask = LVCF_WIDTH;

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