Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[hpoussin] 30011: Silent debug messages
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: hpoussin Date: Wed Oct 31 16:17:42 2007 New Revision: 30011 URL: http://svn.reactos.org/svn/reactos?rev=30011&view=rev Log: Silent debug messages Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Oct 31 16:17:42 2007 @@ -49,6 +49,7 @@ #include "globals.h" #include "resource.h" +#define NDEBUG #include <debug.h> DWORD WINAPI

1 0

[hpoussin] 30010: Allocate enough memory to keep file details
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: hpoussin Date: Wed Oct 31 16:10:07 2007 New Revision: 30010 URL: http://svn.reactos.org/svn/reactos?rev=30010&view=rev Log: Allocate enough memory to keep file details Modified: trunk/reactos/dll/win32/shell32/recyclebin.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Wed Oct 31 16:10:07 2007 @@ -217,37 +217,43 @@ return E_NOTIMPL; } + +PDELETED_FILE_DETAILS_W +UnpackDetailsFromPidl(LPCITEMIDLIST pidl) +{ + return (PDELETED_FILE_DETAILS_W)&pidl->mkid.abID; +} + BOOL WINAPI CBEnumBitBucket(IN PVOID Context, IN HANDLE hDeletedFile) { PDELETED_FILE_DETAILS_W pFileDetails; - DWORD dwSize = 0; + DWORD dwSize, dwTotalSize; LPITEMIDLIST pidl = NULL; BOOL ret; TRACE("CBEnumBitBucket entered\n"); - GetDeletedFileDetailsW(hDeletedFile, - 0, - NULL, - &dwSize); - - if (!dwSize) + if (!GetDeletedFileDetailsW(hDeletedFile, + 0, + NULL, + &dwSize) && + GetLastError() != ERROR_INSUFFICIENT_BUFFER) { ERR("GetDeletedFileDetailsW failed\n"); return FALSE; } - - pidl = SHAlloc(dwSize); + dwTotalSize = FIELD_OFFSET(ITEMIDLIST, mkid.abID) + dwSize; + + pidl = SHAlloc(dwTotalSize); if (!pidl) { ERR("No memory\n"); return FALSE; } - pidl->mkid.cb = dwSize; - pidl->mkid.abID[0] = 0; - pFileDetails = (PDELETED_FILE_DETAILS_W) &pidl->mkid.abID[1]; + pidl->mkid.cb = dwTotalSize; + pFileDetails = UnpackDetailsFromPidl(pidl); if (!GetDeletedFileDetailsW(hDeletedFile, dwSize, @@ -260,13 +266,9 @@ } ret = AddToEnumList((IEnumIDList*)Context, pidl); + TRACE("Returning %d\n", ret); + CloseRecycleBinHandle(hDeletedFile); return ret; -} - -PDELETED_FILE_DETAILS_W -UnpackDetailsFromPidl(LPCITEMIDLIST pidl) -{ - return (PDELETED_FILE_DETAILS_W)&pidl->mkid.abID[1]; } static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SHCONTF grfFlags, IEnumIDList **ppenumIDList)

1 0

[hpoussin] 30009: Add traces Fix typo in EnumerateRecycleBinW
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: hpoussin Date: Wed Oct 31 16:04:47 2007 New Revision: 30009 URL: http://svn.reactos.org/svn/reactos?rev=30009&view=rev Log: Add traces Fix typo in EnumerateRecycleBinW Modified: trunk/reactos/lib/recyclebin/recyclebin.c trunk/reactos/lib/recyclebin/recyclebin_generic.c trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c trunk/reactos/lib/recyclebin/recyclebin_private.h trunk/reactos/lib/recyclebin/recyclebin_v5.c trunk/reactos/lib/recyclebin/recyclebin_v5.h trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c Modified: trunk/reactos/lib/recyclebin/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin.c Wed Oct 31 16:04:47 2007 @@ -204,14 +204,13 @@ hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - IRecycleBinFile_Release(prbf); } cleanup: if (prb) IRecycleBin_Release(prb); if (prbel) - IRecycleBinEnumList_Release(prb); + IRecycleBinEnumList_Release(prbel); if (SUCCEEDED(hr)) return TRUE; if (HRESULT_FACILITY(hr) == FACILITY_WIN32) Modified: trunk/reactos/lib/recyclebin/recyclebin_generic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_generic.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_generic.c Wed Oct 31 16:04:47 2007 @@ -10,6 +10,8 @@ #include "recyclebin_private.h" #include <stdio.h> +WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); + struct RecycleBinGeneric { ULONG ref; @@ -23,6 +25,8 @@ void **ppvObject) { struct RecycleBinGeneric *s = CONTAINING_RECORD(This, struct RecycleBinGeneric, recycleBinImpl); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); if (!ppvObject) return E_POINTER; @@ -47,6 +51,7 @@ { struct RecycleBinGeneric *s = CONTAINING_RECORD(This, struct RecycleBinGeneric, recycleBinImpl); ULONG refCount = InterlockedIncrement((PLONG)&s->ref); + TRACE("(%p)\n", This); return refCount; } @@ -57,8 +62,7 @@ struct RecycleBinGeneric *s = CONTAINING_RECORD(This, struct RecycleBinGeneric, recycleBinImpl); ULONG refCount; - if (!This) - return E_POINTER; + TRACE("(%p)\n", This); refCount = InterlockedDecrement((PLONG)&s->ref); @@ -79,6 +83,8 @@ DWORD len; WCHAR szVolume[MAX_PATH]; HRESULT hr; + + TRACE("(%p, %s)\n", This, debugstr_w(szFileName)); /* Get full file name */ while (TRUE) @@ -142,6 +148,8 @@ IRecycleBin *prb; HRESULT hr; + TRACE("(%p)\n", This); + dwLogicalDrives = GetLogicalDrives(); if (dwLogicalDrives == 0) return HRESULT_FROM_WIN32(GetLastError()); @@ -170,6 +178,7 @@ IN IRecycleBin *This, OUT IRecycleBinEnumList **ppEnumList) { + TRACE("(%p, %p)\n", This, ppEnumList); return RecycleBinGeneric_Enumerator_Constructor(ppEnumList); } Modified: trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_generic_enumerator.c Wed Oct 31 16:04:47 2007 @@ -7,8 +7,10 @@ */ #define COBJMACROS -#include "recyclebin.h" +#include "recyclebin_private.h" #include <stdio.h> + +WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); struct RecycleBinGenericEnum { @@ -27,6 +29,8 @@ { struct RecycleBinGenericEnum *s = CONTAINING_RECORD(This, struct RecycleBinGenericEnum, recycleBinEnumImpl); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); + if (!ppvObject) return E_POINTER; @@ -50,6 +54,7 @@ { struct RecycleBinGenericEnum *s = CONTAINING_RECORD(This, struct RecycleBinGenericEnum, recycleBinEnumImpl); ULONG refCount = InterlockedIncrement((PLONG)&s->ref); + TRACE("(%p)\n", This); return refCount; } @@ -60,8 +65,7 @@ struct RecycleBinGenericEnum *s = CONTAINING_RECORD(This, struct RecycleBinGenericEnum, recycleBinEnumImpl); ULONG refCount; - if (!This) - return E_POINTER; + TRACE("(%p)\n", This); refCount = InterlockedDecrement((PLONG)&s->ref); @@ -87,6 +91,8 @@ DWORD i; DWORD fetched = 0, newFetched; HRESULT hr; + + TRACE("(%p, %u, %p, %p)\n", This, celt, rgelt, pceltFetched); if (!rgelt) return E_POINTER; @@ -173,6 +179,7 @@ IN DWORD celt) { struct RecycleBinGenericEnum *s = CONTAINING_RECORD(This, struct RecycleBinGenericEnum, recycleBinEnumImpl); + TRACE("(%p, %u)\n", This, celt); s->skip += celt; return S_OK; } @@ -182,6 +189,8 @@ IN IRecycleBinEnumList *This) { struct RecycleBinGenericEnum *s = CONTAINING_RECORD(This, struct RecycleBinGenericEnum, recycleBinEnumImpl); + + TRACE("(%p)\n", This); if (s->current) { Modified: trunk/reactos/lib/recyclebin/recyclebin_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_private.h (original) +++ trunk/reactos/lib/recyclebin/recyclebin_private.h Wed Oct 31 16:04:47 2007 @@ -1,5 +1,6 @@ #include "recyclebin.h" #include "sddl.h" +#include <wine/debug.h> /* Defines */ #define RECYCLEBIN_MAGIC 0x6e694252 Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c Wed Oct 31 16:04:47 2007 @@ -10,6 +10,8 @@ #include "recyclebin_v5.h" #include <stdio.h> +WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); + static BOOL IntDeleteRecursive( IN LPCWSTR FullName) @@ -71,6 +73,8 @@ void **ppvObject) { struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); if (!ppvObject) return E_POINTER; @@ -97,6 +101,7 @@ { struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); ULONG refCount = InterlockedIncrement((PLONG)&s->ref); + TRACE("(%p)\n", This); return refCount; } @@ -107,8 +112,7 @@ struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); ULONG refCount; - if (!This) - return E_POINTER; + TRACE("(%p)\n", This); refCount = InterlockedDecrement((PLONG)&s->ref); @@ -143,6 +147,8 @@ DWORD ClusterSize, BytesPerSector, SectorsPerCluster; HRESULT hr; + TRACE("(%p, %s)\n", This, debugstr_w(szFileName)); + if (s->EnumeratorCount != 0) return E_FAIL; @@ -286,6 +292,8 @@ IRecycleBinEnumList *prbel; IRecycleBinFile *prbf; HRESULT hr; + + TRACE("(%p)\n", This); while (TRUE) { @@ -313,6 +321,8 @@ HRESULT hr; IUnknown *pUnk; + TRACE("(%p, %p)\n", This, ppEnumList); + hr = RecycleBin5_Enumerator_Constructor(This, s->hInfo, s->hInfoMapped, s->Folder, &pUnk); if (!SUCCEEDED(hr)) return hr; @@ -338,6 +348,8 @@ PINFO2_HEADER pHeader; DELETED_FILE_RECORD *pRecord, *pLast; DWORD dwEntries, i; + + TRACE("(%p, %s, %p)\n", This, debugstr_w(pDeletedFileName), pDeletedFile); if (s->EnumeratorCount != 0) return E_FAIL; @@ -399,6 +411,8 @@ DELETED_FILE_RECORD *pRecord, *pLast; DWORD dwEntries, i; + TRACE("(%p, %s, %p)\n", This, debugstr_w(pDeletedFileName), pDeletedFile); + if (s->EnumeratorCount != 0) return E_FAIL; @@ -451,9 +465,10 @@ static HRESULT STDMETHODCALLTYPE RecycleBin5_RecycleBin5_OnClosing( IN IRecycleBin5 *This, - IN IRecycleBinEnumList *prb5el) + IN IRecycleBinEnumList *prbel) { struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); + TRACE("(%p, %p)\n", This, prbel); s->EnumeratorCount--; return S_OK; } Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.h (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.h Wed Oct 31 16:04:47 2007 @@ -67,7 +67,7 @@ HRESULT (STDMETHODCALLTYPE *OnClosing)( IN IRecycleBin5 *This, - IN IRecycleBinEnumList *prb5el); + IN IRecycleBinEnumList *prbel); } IRecycleBin5Vtbl; interface IRecycleBin5 Modified: trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5_enumerator.c Wed Oct 31 16:04:47 2007 @@ -9,6 +9,8 @@ #define COBJMACROS #include "recyclebin_v5.h" +WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); + struct RecycleBin5File { ULONG ref; @@ -26,6 +28,8 @@ { struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); + if (!ppvObject) return E_POINTER; @@ -49,6 +53,7 @@ { struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); ULONG refCount = InterlockedIncrement((PLONG)&s->ref); + TRACE("(%p)\n", This); return refCount; } @@ -59,8 +64,7 @@ struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); ULONG refCount; - if (!This) - return E_POINTER; + TRACE("(%p)\n", This); refCount = InterlockedDecrement((PLONG)&s->ref); @@ -83,6 +87,8 @@ DWORD dwAttributes; HANDLE hFile; + TRACE("(%p, %p)\n", This, pLastModificationTime); + dwAttributes = GetFileAttributesW(s->FullName); if (dwAttributes == INVALID_FILE_ATTRIBUTES) return HRESULT_FROM_WIN32(GetLastError()); @@ -107,6 +113,7 @@ OUT FILETIME *pDeletionTime) { struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); + TRACE("(%p, %p)\n", This, pDeletionTime); *pDeletionTime = s->deletedFile.DeletionTime; return S_OK; } @@ -121,6 +128,8 @@ DWORD dwAttributes; HANDLE hFile; + TRACE("(%p, %p)\n", This, pFileSize); + dwAttributes = GetFileAttributesW(s->FullName); if (dwAttributes == INVALID_FILE_ATTRIBUTES) return HRESULT_FROM_WIN32(GetLastError()); @@ -148,6 +157,7 @@ OUT ULARGE_INTEGER *pPhysicalFileSize) { struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); + TRACE("(%p, %p)\n", This, pPhysicalFileSize); pPhysicalFileSize->u.HighPart = 0; pPhysicalFileSize->u.LowPart = s->deletedFile.dwPhysicalFileSize; return S_OK; @@ -160,6 +170,8 @@ { struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); DWORD dwAttributes; + + TRACE("(%p, %p)\n", This, pAttributes); dwAttributes = GetFileAttributesW(s->FullName); if (dwAttributes == INVALID_FILE_ATTRIBUTES) @@ -179,6 +191,8 @@ struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); DWORD dwRequired; + TRACE("(%p, %u, %p, %p)\n", This, BufferSize, Buffer, RequiredSize); + dwRequired = (DWORD)(wcslen(s->deletedFile.FileNameW) + 1) * sizeof(WCHAR); if (RequiredSize) *RequiredSize = dwRequired; @@ -197,6 +211,7 @@ IN IRecycleBinFile *This) { struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); + TRACE("(%p)\n", This); return IRecycleBin5_Delete(s->recycleBin, s->FullName, &s->deletedFile); } @@ -205,6 +220,7 @@ IN IRecycleBinFile *This) { struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); + TRACE("(%p)\n", This); return IRecycleBin5_Restore(s->recycleBin, s->FullName, &s->deletedFile); } @@ -279,6 +295,8 @@ { struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); + if (!ppvObject) return E_POINTER; @@ -302,6 +320,7 @@ { struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); ULONG refCount = InterlockedIncrement((PLONG)&s->ref); + TRACE("(%p)\n", This); return refCount; } @@ -312,8 +331,7 @@ struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); ULONG refCount; - if (!This) - return E_POINTER; + TRACE("(%p)\n", This); refCount = InterlockedDecrement((PLONG)&s->ref); @@ -342,6 +360,8 @@ DWORD fetched = 0, i; DWORD dwEntries; HRESULT hr; + + TRACE("(%p, %u, %p, %p)\n", This, celt, rgelt, pceltFetched); if (!rgelt) return E_POINTER; @@ -383,6 +403,7 @@ IN DWORD celt) { struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); + TRACE("(%p, %u)\n", This, celt); s->dwCurrent += celt; return S_OK; } @@ -392,6 +413,7 @@ IN IRecycleBinEnumList *This) { struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); + TRACE("(%p)\n", This); s->dwCurrent = 0; return S_OK; }

1 0

[fireball] 30008: - By default, #define YDEBUG should be generally commented out.
by fireball＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: fireball Date: Wed Oct 31 13:02:10 2007 New Revision: 30008 URL: http://svn.reactos.org/svn/reactos?rev=30008&view=rev Log: - By default, #define YDEBUG should be generally commented out. Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/recyclebin.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c (original) +++ trunk/reactos/dll/win32/shell32/drive.c Wed Oct 31 13:02:10 2007 @@ -20,7 +20,7 @@ #include "config.h" #include "wine/port.h" -#define YDEBUG +//#define YDEBUG #define LARGEINT_PROTOS #define LargeIntegerDivide RtlLargeIntegerDivide #define ExtendedIntegerMultiply RtlExtendedIntegerMultiply Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c (original) +++ trunk/reactos/dll/win32/shell32/fprop.c Wed Oct 31 13:02:10 2007 @@ -20,7 +20,7 @@ #define COBJMACROS #define NONAMELESSUNION -#define YDEBUG +//#define YDEBUG #include "config.h" #include "wine/port.h" Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Wed Oct 31 13:02:10 2007 @@ -19,7 +19,7 @@ */ #include "config.h" -#define YDEBUG +//#define YDEBUG #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT

1 0

[hpoussin] 30007: We're using combo channel here...
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: hpoussin Date: Wed Oct 31 12:59:26 2007 New Revision: 30007 URL: http://svn.reactos.org/svn/reactos?rev=30007&view=rev Log: We're using combo channel here... Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Wed Oct 31 12:59:26 2007 @@ -37,6 +37,7 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(listbox); +WINE_DECLARE_DEBUG_CHANNEL(combo); /* Start of hack section -------------------------------- */

1 0

[hpoussin] 30006: Fix typo
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: hpoussin Date: Wed Oct 31 12:49:30 2007 New Revision: 30006 URL: http://svn.reactos.org/svn/reactos?rev=30006&view=rev Log: Fix typo Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Wed Oct 31 12:49:30 2007 @@ -1724,7 +1724,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("NtPlugPlayEvent() failed (Status %lx)\n", Status); + DPRINT("NtGetPlugPlayEvent() failed (Status %lx)\n", Status); break; }

1 0

[hpoussin] 30005: Clean some header mess
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: hpoussin Date: Wed Oct 31 12:45:15 2007 New Revision: 30005 URL: http://svn.reactos.org/svn/reactos?rev=30005&view=rev Log: Clean some header mess Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c trunk/reactos/drivers/video/displays/vga/objects/bitblt.c trunk/reactos/drivers/video/displays/vga/objects/copybits.c trunk/reactos/drivers/video/displays/vga/objects/lineto.c trunk/reactos/drivers/video/displays/vga/objects/offscreen.c trunk/reactos/drivers/video/displays/vga/objects/paint.c trunk/reactos/drivers/video/displays/vga/objects/pointer.c trunk/reactos/drivers/video/displays/vga/objects/screen.c trunk/reactos/drivers/video/displays/vga/objects/transblt.c trunk/reactos/drivers/video/displays/vga/vgaddi.h trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/main/enable.c (original) +++ trunk/reactos/drivers/video/displays/vga/main/enable.c Wed Oct 31 12:45:15 2007 @@ -6,12 +6,7 @@ * PROGRAMMERS: */ -#include "../vgaddi.h" -#include "../vgavideo/vgavideo.h" -#define NDEBUG -#include <debug.h> - -#define DBG_PREFIX "VGADDI: " +#include <vgaddi.h> static BOOL VGAInitialized = FALSE; @@ -183,7 +178,7 @@ IN ULONG SizeOfDED, OUT PDRVENABLEDATA DriveEnableData) { - /* EngDebugPrint("VGADDI", "DrvEnableDriver called...\n", 0); */ + DPRINT("DrvEnableDriver called...\n"); vgaPreCalc(); @@ -251,7 +246,7 @@ PDev = EngAllocMem(FL_ZERO_MEMORY, sizeof(PDEV), ALLOC_TAG); if (PDev == NULL) { - EngDebugPrint(DBG_PREFIX, "EngAllocMem failed for PDEV\n", 0); + DPRINT1("EngAllocMem failed for PDEV\n"); return NULL; } PDev->KMDriver = Driver; @@ -579,4 +574,13 @@ return OutputSize; } +ULONG DbgPrint(PCCH Format,...) +{ + va_list ap; + va_start(ap, Format); + EngDebugPrint("VGADDI", (PCHAR)Format, ap); + va_end(ap); + return 0; +} + /* EOF */ Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Wed Oct 31 12:45:15 2007 @@ -6,13 +6,7 @@ * PROGRAMMERS: */ -#include "../vgaddi.h" -#include "../vgavideo/vgavideo.h" -#include "brush.h" -#include "bitblt.h" - -#define NDEBUG -#include <debug.h> +#include <vgaddi.h> typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*); typedef BOOL (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj, Modified: trunk/reactos/drivers/video/displays/vga/objects/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/copybits.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/copybits.c Wed Oct 31 12:45:15 2007 @@ -6,9 +6,7 @@ * PROGRAMMERS: */ -#include "../vgaddi.h" -#include "../vgavideo/vgavideo.h" -#include <debug.h> +#include <vgaddi.h> BOOL APIENTRY DrvCopyBits( Modified: trunk/reactos/drivers/video/displays/vga/objects/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/lineto.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/lineto.c Wed Oct 31 12:45:15 2007 @@ -6,8 +6,7 @@ * PROGRAMMERS: Copyright (C) 1998-2003 ReactOS Team */ -#include "../vgaddi.h" -#include "../vgavideo/vgavideo.h" +#include <vgaddi.h> /* * Draw a line from top-left to bottom-right Modified: trunk/reactos/drivers/video/displays/vga/objects/offscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/offscreen.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/offscreen.c Wed Oct 31 12:45:15 2007 @@ -8,9 +8,7 @@ /* INCLUDES ******************************************************************/ -#include "../vgaddi.h" -#include "../vgavideo/vgavideo.h" -#include <debug.h> +#include <vgaddi.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/drivers/video/displays/vga/objects/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/paint.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/paint.c Wed Oct 31 12:45:15 2007 @@ -6,11 +6,7 @@ * PROGRAMMERS: */ -#include "../vgaddi.h" -#include "../vgavideo/vgavideo.h" -#include "brush.h" - -#include <debug.h> +#include <vgaddi.h> BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor) { Modified: trunk/reactos/drivers/video/displays/vga/objects/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/pointer.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/pointer.c Wed Oct 31 12:45:15 2007 @@ -8,11 +8,7 @@ /* INCLUDES ******************************************************************/ -#include "../vgaddi.h" -#include "../vgavideo/vgavideo.h" - -#define NDEBUG -#include <debug.h> +#include <vgaddi.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/drivers/video/displays/vga/objects/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/screen.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/screen.c Wed Oct 31 12:45:15 2007 @@ -6,8 +6,7 @@ * PROGRAMMERS: */ -#include "../vgaddi.h" -#include "../vgavideo/vgavideo.h" +#include <vgaddi.h> static WORD PaletteBuffer[] = { 16, 0, // 16 entries, start with 0 @@ -125,8 +124,8 @@ 0, &ReturnedDataLength)) { - //DPRINT1("Failed to unmap video memory.\n"); - DbgBreakPoint(); + DPRINT1("Failed to unmap video memory.\n"); + EngDebugBreak(); return FALSE; } return TRUE; Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/objects/transblt.c (original) +++ trunk/reactos/drivers/video/displays/vga/objects/transblt.c Wed Oct 31 12:45:15 2007 @@ -6,13 +6,7 @@ * PROGRAMMERS: */ -#include "../vgaddi.h" -#include "../vgavideo/vgavideo.h" -#include "brush.h" -#include "bitblt.h" - -#define NDEBUG -#include <debug.h> +#include <vgaddi.h> BOOL APIENTRY DrvTransparentBlt( Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.h (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h Wed Oct 31 12:45:15 2007 @@ -11,6 +11,17 @@ #include <winioctl.h> #include <ntddvdeo.h> +#include "vgavideo/vgavideo.h" +#include "objects/brush.h" +#include "objects/bitblt.h" + +#ifndef NDEBUG +#define DPRINT DbgPrint +#else +#define DPRINT +#endif +#define DPRINT1 DbgPrint + /* FIXME - what a headers mess.... */ #define DDKAPI __stdcall @@ -19,10 +30,10 @@ #define DDKCDECLAPI __cdecl ULONG DbgPrint(PCCH Format,...); -VOID DDKAPI DbgBreakPoint(VOID); -VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value); -VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value); -UCHAR DDKAPI READ_REGISTER_UCHAR(IN PUCHAR Register); +VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value); +VOID DDKAPI WRITE_PORT_USHORT(IN PUSHORT Port, IN USHORT Value); +VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value); +UCHAR DDKAPI READ_REGISTER_UCHAR(IN PUCHAR Register); static __inline BOOLEAN RemoveEntryList( Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c (original) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c Wed Oct 31 12:45:15 2007 @@ -6,25 +6,7 @@ * PROGRAMMERS: */ -#define _WINBASE_ -#define _WINDOWS_H -#include <stdarg.h> -#include <windef.h> -#include <guiddef.h> -#include <wingdi.h> -#include <winddi.h> -#include <winioctl.h> -#include <ntddvdeo.h> -#include <stdlib.h> -#include "vgavideo.h" - -#define DDKAPI __stdcall -#define DDKFASTAPI __fastcall -#define FASTCALL __fastcall -#define DDKCDECLAPI __cdecl - -VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value); -VOID DDKAPI WRITE_PORT_USHORT(IN PUSHORT Port, IN USHORT Value); +#include <vgaddi.h> UCHAR PreCalcReverseByte[256]; int maskbit[640]; @@ -40,9 +22,6 @@ static int byteCounter; static unsigned char rightMask; -#define READ_REGISTER_UCHAR(p) (*((volatile UCHAR *)(p))) -#define WRITE_REGISTER_UCHAR(p,c) (*((volatile CHAR *)(p))) = (c) - UCHAR bytesPerPixel(ULONG Format) { /* This function is taken from /subsys/win32k/eng/surface.c @@ -460,7 +439,7 @@ c1 = (vgaGetPixel(x + i, y + j) << 4) | (vgaGetPixel(x + i + 1, y + j)); c2 = ((PUCHAR)b)[(j * Dest_lDelta) + (i >> 1)]; if ((c1 & mask) != (c2 & mask)) - DbgBreakPoint(); + EngDebugBreak(); } } #endif /* VGA_VERIFY */

1 0

[hpoussin] 30004: Clean up method which assigns groups to logged on user We have now a compile time switch to test ReactOS with a non-administrator account
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: hpoussin Date: Wed Oct 31 12:41:56 2007 New Revision: 30004 URL: http://svn.reactos.org/svn/reactos?rev=30004&view=rev Log: Clean up method which assigns groups to logged on user We have now a compile time switch to test ReactOS with a non-administrator account Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c Wed Oct 31 12:41:56 2007 @@ -404,164 +404,175 @@ static PTOKEN_GROUPS -AllocateGroupSids(PSID *PrimaryGroupSid, - PSID *OwnerSid) +AllocateGroupSids( + OUT PSID *PrimaryGroupSid, + OUT PSID *OwnerSid) { - SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; - SID_IDENTIFIER_AUTHORITY LocalAuthority = {SECURITY_LOCAL_SID_AUTHORITY}; - SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; - PTOKEN_GROUPS TokenGroups; - PSID DomainSid; - PSID Sid; - LUID Luid; - NTSTATUS Status; - - Status = NtAllocateLocallyUniqueId(&Luid); - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - if (!SamGetDomainSid(&DomainSid)) - { - return NULL; - } - - TokenGroups = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(TOKEN_GROUPS) + - 8 * sizeof(SID_AND_ATTRIBUTES)); - if (TokenGroups == NULL) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - DomainSid); - return NULL; - } - - TokenGroups->GroupCount = 8; - - Sid = AppendRidToSid(DomainSid, - DOMAIN_GROUP_RID_USERS); - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - DomainSid); - - TokenGroups->Groups[0].Sid = Sid; - TokenGroups->Groups[0].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - *PrimaryGroupSid = Sid; - - - RtlAllocateAndInitializeSid(&WorldAuthority, - 1, - SECURITY_WORLD_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - - TokenGroups->Groups[1].Sid = Sid; - TokenGroups->Groups[1].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - - - RtlAllocateAndInitializeSid(&SystemAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - - TokenGroups->Groups[2].Sid = Sid; - TokenGroups->Groups[2].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - - *OwnerSid = Sid; - - RtlAllocateAndInitializeSid(&SystemAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_USERS, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - - TokenGroups->Groups[3].Sid = Sid; - TokenGroups->Groups[3].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - - /* Logon SID */ - RtlAllocateAndInitializeSid(&SystemAuthority, - SECURITY_LOGON_IDS_RID_COUNT, - SECURITY_LOGON_IDS_RID, - Luid.HighPart, - Luid.LowPart, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - - TokenGroups->Groups[4].Sid = Sid; - TokenGroups->Groups[4].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY | SE_GROUP_LOGON_ID; - - RtlAllocateAndInitializeSid(&LocalAuthority, - 1, - SECURITY_LOCAL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - - TokenGroups->Groups[5].Sid = Sid; - TokenGroups->Groups[5].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - - RtlAllocateAndInitializeSid(&SystemAuthority, - 1, - SECURITY_INTERACTIVE_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - - TokenGroups->Groups[6].Sid = Sid; - TokenGroups->Groups[6].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - - RtlAllocateAndInitializeSid(&SystemAuthority, - 1, - SECURITY_AUTHENTICATED_USER_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &Sid); - - TokenGroups->Groups[7].Sid = Sid; - TokenGroups->Groups[7].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; - - return TokenGroups; + SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY LocalAuthority = {SECURITY_LOCAL_SID_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; + PTOKEN_GROUPS TokenGroups; +#define MAX_GROUPS 8 + DWORD GroupCount = 0; + PSID DomainSid; + PSID Sid; + LUID Luid; + NTSTATUS Status; + + Status = NtAllocateLocallyUniqueId(&Luid); + if (!NT_SUCCESS(Status)) + return NULL; + + if (!SamGetDomainSid(&DomainSid)) + return NULL; + + TokenGroups = RtlAllocateHeap( + GetProcessHeap(), 0, + sizeof(TOKEN_GROUPS) + + MAX_GROUPS * sizeof(SID_AND_ATTRIBUTES)); + if (TokenGroups == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + return NULL; + } + + Sid = AppendRidToSid(DomainSid, DOMAIN_GROUP_RID_USERS); + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + /* Member of the domain */ + TokenGroups->Groups[GroupCount].Sid = Sid; + TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + *PrimaryGroupSid = Sid; + GroupCount++; + + /* Member of 'Everyone' */ + RtlAllocateAndInitializeSid( + &WorldAuthority, + 1, + SECURITY_WORLD_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + &Sid); + TokenGroups->Groups[GroupCount].Sid = Sid; + TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + GroupCount++; + +#if 1 + /* Member of 'Administrators' */ + RtlAllocateAndInitializeSid( + &SystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + &Sid); + TokenGroups->Groups[GroupCount].Sid = Sid; + TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + GroupCount++; +#else + DPRINT1("Not adding user to Administrators group\n"); +#endif + + /* Member of 'Users' */ + RtlAllocateAndInitializeSid( + &SystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + &Sid); + TokenGroups->Groups[GroupCount].Sid = Sid; + TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + GroupCount++; + + /* Logon SID */ + RtlAllocateAndInitializeSid( + &SystemAuthority, + SECURITY_LOGON_IDS_RID_COUNT, + SECURITY_LOGON_IDS_RID, + Luid.HighPart, + Luid.LowPart, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + &Sid); + TokenGroups->Groups[GroupCount].Sid = Sid; + TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY | SE_GROUP_LOGON_ID; + GroupCount++; + *OwnerSid = Sid; + + /* Member of 'Local users */ + RtlAllocateAndInitializeSid( + &LocalAuthority, + 1, + SECURITY_LOCAL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + &Sid); + TokenGroups->Groups[GroupCount].Sid = Sid; + TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + GroupCount++; + + /* Member of 'Interactive users' */ + RtlAllocateAndInitializeSid( + &SystemAuthority, + 1, + SECURITY_INTERACTIVE_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + &Sid); + TokenGroups->Groups[GroupCount].Sid = Sid; + TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + GroupCount++; + + /* Member of 'Authenticated users' */ + RtlAllocateAndInitializeSid( + &SystemAuthority, + 1, + SECURITY_AUTHENTICATED_USER_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + &Sid); + TokenGroups->Groups[GroupCount].Sid = Sid; + TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; + GroupCount++; + + TokenGroups->GroupCount = GroupCount; + ASSERT(TokenGroups->GroupCount <= MAX_GROUPS); + + return TokenGroups; } @@ -663,18 +674,8 @@ /* Get the user SID from the registry */ if (!SamGetUserSid (lpszUsername, &UserSid)) { - DPRINT ("SamGetUserSid() failed\n"); - RtlAllocateAndInitializeSid (&SystemAuthority, - 5, - SECURITY_NT_NON_UNIQUE, - 0x12345678, - 0x12345678, - 0x12345678, - DOMAIN_USER_RID_ADMIN, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - &UserSid); + DPRINT1 ("SamGetUserSid() failed\n"); + return FALSE; } TokenUser.User.Sid = UserSid;

1 0

[hpoussin] 30003: Partially implement ElfrReportEventW
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: hpoussin Date: Wed Oct 31 12:33:16 2007 New Revision: 30003 URL: http://svn.reactos.org/svn/reactos?rev=30003&view=rev Log: Partially implement ElfrReportEventW Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c (original) +++ trunk/reactos/base/services/eventlog/rpc.c Wed Oct 31 12:33:16 2007 @@ -151,7 +151,8 @@ /* [out] */ PLOGHANDLE Handle) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + *Handle = 1; + return STATUS_SUCCESS; } @@ -203,8 +204,43 @@ /* [unique][out][in] */ long __RPC_FAR * unknown1, /* [unique][out][in] */ long __RPC_FAR * unknown2) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + short i; + + /* partial stub */ + + if (NumStrings == 0) + return STATUS_SUCCESS; + + if (Strings == NULL) + return STATUS_SUCCESS; + + for (i = 0; i < NumStrings; i++) + { + switch (Type) + { + case EVENTLOG_SUCCESS: + DPRINT1("Success: %S\n", Strings[i]); + break; + + case EVENTLOG_ERROR_TYPE: + DPRINT1("Error: %S\n", Strings[i]); + break; + + case EVENTLOG_WARNING_TYPE: + DPRINT1("Warning: %S\n", Strings[i]); + break; + + case EVENTLOG_INFORMATION_TYPE: + DPRINT1("Info: %S\n", Strings[i]); + break; + + default: + DPRINT1("Type %hu: %S\n", Type, Strings[i]); + break; + } + } + + return STATUS_SUCCESS; }

1 0

[hpoussin] 30002: Fix two typos
by hpoussin＠svn.reactos.org 31 Oct '07

31 Oct '07

Author: hpoussin Date: Wed Oct 31 12:31:06 2007 New Revision: 30002 URL: http://svn.reactos.org/svn/reactos?rev=30002&view=rev Log: Fix two typos Modified: trunk/reactos/drivers/bus/pci/pci.c trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/drivers/bus/pci/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.c (original) +++ trunk/reactos/drivers/bus/pci/pci.c Wed Oct 31 12:31:06 2007 @@ -452,7 +452,7 @@ Description = L"XGA display controller"; break; - case PCI_SUBLCASS_VID_3D_CTLR: + case PCI_SUBCLASS_VID_3D_CTLR: Description = L"Multimedia display controller"; break; Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Wed Oct 31 12:31:06 2007 @@ -4123,7 +4123,7 @@ #define PCI_SUBCLASS_VID_VGA_CTLR 0x00 #define PCI_SUBCLASS_VID_XGA_CTLR 0x01 -#define PCI_SUBLCASS_VID_3D_CTLR 0x02 +#define PCI_SUBCLASS_VID_3D_CTLR 0x02 #define PCI_SUBCLASS_VID_OTHER 0x80 /* PCI device subclasses for class 4 (multimedia device)*/ @@ -9365,7 +9365,7 @@ IN KIRQL NewIrql); NTKERNELAPI -KIRQL +VOID NTAPI KeRaiseIrql( IN KIRQL NewIrql,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007