Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[hpoussin] 30812: No need to increment handle count, it is already done in ExpAllocateHandleTableEntry()

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Nov 27 11:41:27 2007 New Revision: 30812 URL: http://svn.reactos.org/svn/reactos?rev=30812&view=rev Log: No need to increment handle count, it is already done in ExpAllocateHandleTableEntry() Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Tue Nov 27 11:41:27 2007 @@ -1120,9 +1120,8 @@ HandleTableEntry, NewEntry)) { - /* Lock the entry, increase the handle count */ + /* Lock the entry */ NewEntry->Value |= EXHANDLE_TABLE_ENTRY_LOCK_BIT; - NewTable->HandleCount++; } else {

17 years

[hpoussin] 30811: Better compatibility with MS Windows recycle bin Add traces

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Nov 27 11:22:16 2007 New Revision: 30811 URL: http://svn.reactos.org/svn/reactos?rev=30811&view=rev Log: Better compatibility with MS Windows recycle bin Add traces Modified: trunk/reactos/lib/recyclebin/readme.txt 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/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/readme.txt?… ============================================================================== --- trunk/reactos/lib/recyclebin/readme.txt (original) +++ trunk/reactos/lib/recyclebin/readme.txt Tue Nov 27 11:22:16 2007 @@ -4,7 +4,6 @@ TODO - Empty a recycle bin containing directories (v5) - Set security on recycle bin folder -- Delete files > 4Gb - Make the library thread-safe 3 levels 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 Tue Nov 27 11:22:16 2007 @@ -10,12 +10,16 @@ #include "recyclebin_private.h" #include <stdio.h> +WINE_DEFAULT_DEBUG_CHANNEL(recyclebin); + BOOL WINAPI CloseRecycleBinHandle( IN HANDLE hDeletedFile) { IRecycleBinFile *rbf = (IRecycleBinFile *)hDeletedFile; HRESULT hr; + + TRACE("(%p)\n", hDeletedFile); hr = IRecycleBinFile_Release(rbf); if (SUCCEEDED(hr)) @@ -35,6 +39,8 @@ LPWSTR FileNameW = NULL; BOOL ret = FALSE; + TRACE("(%s)\n", debugstr_a(FileName)); + /* Check parameters */ if (FileName == NULL) { @@ -67,6 +73,8 @@ { IRecycleBin *prb; HRESULT hr; + + TRACE("(%s)\n", debugstr_w(FileName)); hr = GetDefaultRecycleBin(NULL, &prb); if (!SUCCEEDED(hr)) @@ -93,6 +101,8 @@ LPWSTR szRootW = NULL; BOOL ret = FALSE; + TRACE("(%s)\n", debugstr_a(pszRoot)); + if (pszRoot) { len = MultiByteToWideChar(CP_ACP, 0, pszRoot, -1, NULL, 0); @@ -121,6 +131,8 @@ { IRecycleBin *prb; HRESULT hr; + + TRACE("(%s)\n", debugstr_w(pszRoot)); hr = GetDefaultRecycleBin(pszRoot, &prb); if (!SUCCEEDED(hr)) @@ -149,6 +161,8 @@ LPWSTR szRootW = NULL; BOOL ret = FALSE; + TRACE("(%s, %p, %p)\n", debugstr_a(pszRoot), pFnCallback, Context); + if (pszRoot) { len = MultiByteToWideChar(CP_ACP, 0, pszRoot, -1, NULL, 0); @@ -181,6 +195,8 @@ IRecycleBinEnumList *prbel = NULL; IRecycleBinFile *prbf; HRESULT hr; + + TRACE("(%s, %p, %p)\n", debugstr_w(pszRoot), pFnCallback, Context); hr = GetDefaultRecycleBin(NULL, &prb); if (!SUCCEEDED(hr)) @@ -231,6 +247,8 @@ DWORD BufferSizeW = 0; BOOL ret = FALSE; + TRACE("(%p, %lu, %p, %p)\n", hDeletedFile, BufferSize, FileDetails, RequiredSize); + if (BufferSize >= FIELD_OFFSET(DELETED_FILE_DETAILS_A, FileName)) { BufferSizeW = FIELD_OFFSET(DELETED_FILE_DETAILS_W, FileName) @@ -274,6 +292,8 @@ HRESULT hr; SIZE_T NameSize, Needed; + TRACE("(%p, %lu, %p, %p)\n", hDeletedFile, BufferSize, FileDetails, RequiredSize); + hr = IRecycleBinFile_GetFileName(rbf, 0, NULL, &NameSize); if (!SUCCEEDED(hr)) goto cleanup; @@ -321,6 +341,8 @@ IRecycleBinFile *rbf = (IRecycleBinFile *)hDeletedFile; HRESULT hr; + TRACE("(%p)\n", hDeletedFile); + hr = IRecycleBinFile_Restore(rbf); if (SUCCEEDED(hr)) return TRUE; @@ -339,6 +361,8 @@ IUnknown *pUnk; HRESULT hr; + TRACE("(%s, %p)\n", debugstr_w(pszVolume), pprb); + if (!pprb) return E_POINTER; 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 Tue Nov 27 11:22:16 2007 @@ -19,7 +19,7 @@ }; static HRESULT STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_QueryInterface( +RecycleBinGeneric_RecycleBin_QueryInterface( IRecycleBin *This, REFIID riid, void **ppvObject) @@ -46,7 +46,7 @@ } static ULONG STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_AddRef( +RecycleBinGeneric_RecycleBin_AddRef( IRecycleBin *This) { struct RecycleBinGeneric *s = CONTAINING_RECORD(This, struct RecycleBinGeneric, recycleBinImpl); @@ -55,8 +55,17 @@ return refCount; } +static VOID +RecycleBinGeneric_Destructor( + struct RecycleBinGeneric *s) +{ + TRACE("(%p)\n", s); + + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_Release( +RecycleBinGeneric_RecycleBin_Release( IRecycleBin *This) { struct RecycleBinGeneric *s = CONTAINING_RECORD(This, struct RecycleBinGeneric, recycleBinImpl); @@ -67,13 +76,13 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - CoTaskMemFree(s); + RecycleBinGeneric_Destructor(s); return refCount; } static HRESULT STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_DeleteFile( +RecycleBinGeneric_RecycleBin_DeleteFile( IN IRecycleBin *This, IN LPCWSTR szFileName) { @@ -140,7 +149,7 @@ } static HRESULT STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_EmptyRecycleBin( +RecycleBinGeneric_RecycleBin_EmptyRecycleBin( IN IRecycleBin *This) { WCHAR szVolumeName[MAX_PATH]; @@ -161,7 +170,7 @@ swprintf(szVolumeName, L"%c:\\", 'A' + i); if (GetDriveTypeW(szVolumeName) != DRIVE_FIXED) continue; - + hr = GetDefaultRecycleBin(szVolumeName, &prb); if (!SUCCEEDED(hr)) return hr; @@ -174,22 +183,22 @@ } static HRESULT STDMETHODCALLTYPE -RecycleBinGenericVtbl_RecycleBin_EnumObjects( +RecycleBinGeneric_RecycleBin_EnumObjects( IN IRecycleBin *This, OUT IRecycleBinEnumList **ppEnumList) { TRACE("(%p, %p)\n", This, ppEnumList); - return RecycleBinGeneric_Enumerator_Constructor(ppEnumList); + return RecycleBinGenericEnum_Constructor(ppEnumList); } CONST_VTBL struct IRecycleBinVtbl RecycleBinGenericVtbl = { - RecycleBinGenericVtbl_RecycleBin_QueryInterface, - RecycleBinGenericVtbl_RecycleBin_AddRef, - RecycleBinGenericVtbl_RecycleBin_Release, - RecycleBinGenericVtbl_RecycleBin_DeleteFile, - RecycleBinGenericVtbl_RecycleBin_EmptyRecycleBin, - RecycleBinGenericVtbl_RecycleBin_EnumObjects, + RecycleBinGeneric_RecycleBin_QueryInterface, + RecycleBinGeneric_RecycleBin_AddRef, + RecycleBinGeneric_RecycleBin_Release, + RecycleBinGeneric_RecycleBin_DeleteFile, + RecycleBinGeneric_RecycleBin_EmptyRecycleBin, + RecycleBinGeneric_RecycleBin_EnumObjects, }; HRESULT RecycleBinGeneric_Constructor(OUT IUnknown **ppUnknown) 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 Tue Nov 27 11:22:16 2007 @@ -58,6 +58,17 @@ return refCount; } +static VOID +RecycleBinGenericEnum_Destructor( + struct RecycleBinGenericEnum *s) +{ + TRACE("(%p)\n", s); + + if (s->current) + IRecycleBinEnumList_Release(s->current); + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE RecycleBinGenericEnum_RecycleBinEnumList_Release( IN IRecycleBinEnumList *This) @@ -70,11 +81,7 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - { - if (s->current) - IRecycleBinEnumList_Release(s->current); - CoTaskMemFree(s); - } + RecycleBinGenericEnum_Destructor(s); return refCount; } @@ -213,7 +220,7 @@ }; HRESULT -RecycleBinGeneric_Enumerator_Constructor( +RecycleBinGenericEnum_Constructor( OUT IRecycleBinEnumList **pprbel) { struct RecycleBinGenericEnum *s; 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 Tue Nov 27 11:22:16 2007 @@ -3,21 +3,12 @@ #include <wine/debug.h> /* Defines */ -#define RECYCLEBIN_MAGIC 0x6e694252 -#define DELETEDFILE_MAGIC 0x6e694253 #define RECYCLE_BIN_DIRECTORY_WITH_ACL L"RECYCLER" #define RECYCLE_BIN_DIRECTORY_WITHOUT_ACL L"RECYCLED" #define RECYCLE_BIN_FILE_NAME L"INFO2" #define ROUND_UP(N, S) ((( (N) + (S) - 1) / (S) ) * (S) ) - -/* List manipulation */ -#define InitializeListHead(le) (void)((le)->Flink = (le)->Blink = (le)) -#define InsertTailList(le,e) do { PLIST_ENTRY b = (le)->Blink; (e)->Flink = (le); (e)->Blink = b; b->Flink = (e); (le)->Blink = (e); } while (0) -#define RemoveEntryList(Entry) { PLIST_ENTRY _EX_Blink, _EX_Flink; _EX_Flink = (Entry)->Flink; _EX_Blink = (Entry)->Blink; _EX_Blink->Flink = _EX_Flink; _EX_Flink->Blink = _EX_Blink; } - -/* Typedefs */ /* Structures on disk */ @@ -26,8 +17,8 @@ typedef struct _INFO2_HEADER { DWORD dwVersion; - DWORD dwNumberOfEntries; - DWORD dwHighestRecordUniqueId; + DWORD dwNumberOfEntries; /* unused */ + DWORD dwHighestRecordUniqueId; /* unused */ DWORD dwRecordSize; DWORD dwTotalLogicalSize; } INFO2_HEADER, *PINFO2_HEADER; @@ -42,7 +33,7 @@ /* recyclebin_generic_enumerator.c */ -HRESULT RecycleBinGeneric_Enumerator_Constructor(OUT IRecycleBinEnumList **pprbel); +HRESULT RecycleBinGenericEnum_Constructor(OUT IRecycleBinEnumList **pprbel); /* recyclebin_v5.c */ 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 Tue Nov 27 11:22:16 2007 @@ -67,7 +67,7 @@ }; static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_QueryInterface( +RecycleBin5_RecycleBin5_QueryInterface( IRecycleBin5 *This, REFIID riid, void **ppvObject) @@ -105,6 +105,19 @@ return refCount; } +static VOID +RecycleBin5_Destructor( + struct RecycleBin5 *s) +{ + TRACE("(%p)\n", s); + + if (s->hInfo && s->hInfo != INVALID_HANDLE_VALUE) + CloseHandle(s->hInfo); + if (s->hInfoMapped) + CloseHandle(s->hInfoMapped); + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE RecycleBin5_RecycleBin5_Release( IRecycleBin5 *This) @@ -117,11 +130,7 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - { - CloseHandle(s->hInfo); - CloseHandle(s->hInfoMapped); - CoTaskMemFree(s); - } + RecycleBin5_Destructor(s); return refCount; } @@ -141,8 +150,8 @@ HANDLE hFile = INVALID_HANDLE_VALUE; PINFO2_HEADER pHeader = NULL; PDELETED_FILE_RECORD pDeletedFile; - ULARGE_INTEGER fileSize; - DWORD dwAttributes; + ULARGE_INTEGER FileSize; + DWORD dwAttributes, dwEntries; SYSTEMTIME SystemTime; DWORD ClusterSize, BytesPerSector, SectorsPerCluster; HRESULT hr; @@ -209,37 +218,51 @@ hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - pDeletedFile = ((PDELETED_FILE_RECORD)(pHeader + 1)) + pHeader->dwNumberOfEntries; + + /* Get number of entries */ + FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); + if (FileSize.u.LowPart < sizeof(INFO2_HEADER)) + { + UnmapViewOfFile(pHeader); + return HRESULT_FROM_WIN32(GetLastError()); + } + dwEntries = (DWORD)((FileSize.QuadPart - sizeof(INFO2_HEADER)) / sizeof(DELETED_FILE_RECORD)) - 1; + pDeletedFile = ((PDELETED_FILE_RECORD)(pHeader + 1)) + dwEntries; /* Get file size */ #if 0 - if (!GetFileSizeEx(hFile, (PLARGE_INTEGER)&fileSize)) + if (!GetFileSizeEx(hFile, (PLARGE_INTEGER)&FileSize)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } #else - fileSize.u.LowPart = GetFileSize(hFile, &fileSize.u.HighPart); - if (fileSize.u.LowPart == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) + FileSize.u.LowPart = GetFileSize(hFile, &FileSize.u.HighPart); + if (FileSize.u.LowPart == INVALID_FILE_SIZE && GetLastError() != NO_ERROR) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } #endif /* Check if file size is > 4Gb */ - if (fileSize.u.HighPart != 0) - { - /* FIXME: how to delete files >= 4Gb? */ - hr = E_NOTIMPL; - goto cleanup; - } - pHeader->dwTotalLogicalSize += fileSize.u.LowPart; + if (FileSize.u.HighPart != 0) + { + /* Yes, this recyclebin can't support this file */ + hr = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); + goto cleanup; + } + pHeader->dwTotalLogicalSize += FileSize.u.LowPart; /* Generate new name */ - pHeader->dwHighestRecordUniqueId++; Extension = wcsrchr(szFullName, '.'); ZeroMemory(pDeletedFile, sizeof(DELETED_FILE_RECORD)); - pDeletedFile->dwRecordUniqueId = pHeader->dwHighestRecordUniqueId; + if (dwEntries == 0) + pDeletedFile->dwRecordUniqueId = 0; + else + { + PDELETED_FILE_RECORD pLastDeleted = ((PDELETED_FILE_RECORD)(pHeader + 1)) + dwEntries - 1; + pDeletedFile->dwRecordUniqueId = pLastDeleted->dwRecordUniqueId + 1; + } pDeletedFile->dwDriveNumber = tolower(szFullName[0]) - 'a'; _snwprintf(DeletedFileName, MAX_PATH, L"%s\\D%c%lu%s", s->Folder, pDeletedFile->dwDriveNumber + 'a', pDeletedFile->dwRecordUniqueId, Extension); @@ -258,7 +281,7 @@ hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - pDeletedFile->dwPhysicalFileSize = ROUND_UP(fileSize.u.LowPart, ClusterSize); + pDeletedFile->dwPhysicalFileSize = ROUND_UP(FileSize.u.LowPart, ClusterSize); /* Set name */ wcscpy(pDeletedFile->FileNameW, szFullName); @@ -268,7 +291,6 @@ SetLastError(ERROR_INVALID_NAME); goto cleanup; } - pHeader->dwNumberOfEntries++; /* Move file */ if (MoveFileW(szFullName, DeletedFileName)) @@ -323,7 +345,7 @@ TRACE("(%p, %p)\n", This, ppEnumList); - hr = RecycleBin5_Enumerator_Constructor(This, s->hInfo, s->hInfoMapped, s->Folder, &pUnk); + hr = RecycleBin5Enum_Constructor(This, s->hInfo, s->hInfoMapped, s->Folder, &pUnk); if (!SUCCEEDED(hr)) return hr; @@ -353,7 +375,7 @@ if (s->EnumeratorCount != 0) return E_FAIL; - + pHeader = MapViewOfFile(s->hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); if (!pHeader) return HRESULT_FROM_WIN32(GetLastError()); @@ -729,13 +751,7 @@ if (!SUCCEEDED(hr)) { if (s) - { - if (s->hInfo && s->hInfo != INVALID_HANDLE_VALUE) - CloseHandle(s->hInfo); - if (s->hInfoMapped) - CloseHandle(s->hInfoMapped); - CoTaskMemFree(s); - } + RecycleBin5_Destructor(s); } return hr; } 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 Tue Nov 27 11:22:16 2007 @@ -97,7 +97,7 @@ #endif HRESULT -RecycleBin5_Enumerator_Constructor( +RecycleBin5Enum_Constructor( IN IRecycleBin5 *prb, IN HANDLE hInfo, IN HANDLE hInfoMapped, 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 Tue Nov 27 11:22:16 2007 @@ -57,6 +57,16 @@ return refCount; } +static VOID +RecycleBin5File_Destructor( + struct RecycleBin5File *s) +{ + TRACE("(%p)\n", s); + + IRecycleBin5_Release(s->recycleBin); + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE RecycleBin5File_RecycleBinFile_Release( IN IRecycleBinFile *This) @@ -69,10 +79,7 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - { - IRecycleBin5_Release(s->recycleBin); - CoTaskMemFree(s); - } + RecycleBin5File_Destructor(s); return refCount; } @@ -240,7 +247,7 @@ }; static HRESULT -RecycleBin5_File_Constructor( +RecycleBin5File_Constructor( IN IRecycleBin5 *prb, IN LPCWSTR Folder, IN PDELETED_FILE_RECORD pDeletedFile, @@ -272,6 +279,11 @@ IRecycleBin5_AddRef(s->recycleBin); *ppFile = &s->recycleBinFileImpl; wsprintfW(s->FullName, L"%s\\D%c%lu%s", Folder, pDeletedFile->dwDriveNumber + 'a', pDeletedFile->dwRecordUniqueId, Extension); + if (GetFileAttributesW(s->FullName) == INVALID_FILE_ATTRIBUTES) + { + RecycleBin5File_Destructor(s); + return E_FAIL; + } return S_OK; } @@ -324,6 +336,18 @@ return refCount; } +static VOID +RecycleBin5Enum_Destructor( + struct RecycleBin5Enum *s) +{ + TRACE("(%p)\n", s); + + IRecycleBin5_OnClosing(s->recycleBin, &s->recycleBinEnumImpl); + UnmapViewOfFile(s->pInfo); + IRecycleBin5_Release(s->recycleBin); + CoTaskMemFree(s); +} + static ULONG STDMETHODCALLTYPE RecycleBin5Enum_RecycleBinEnumList_Release( IN IRecycleBinEnumList *This) @@ -336,12 +360,7 @@ refCount = InterlockedDecrement((PLONG)&s->ref); if (refCount == 0) - { - IRecycleBin5_OnClosing(s->recycleBin, This); - UnmapViewOfFile(s->pInfo); - IRecycleBin5_Release(s->recycleBin); - CoTaskMemFree(s); - } + RecycleBin5Enum_Destructor(s); return refCount; } @@ -377,15 +396,10 @@ pDeletedFile = (DELETED_FILE_RECORD *)(pHeader + 1) + i; for (; i < dwEntries && fetched < celt; i++) { - hr = RecycleBin5_File_Constructor(s->recycleBin, s->szPrefix, pDeletedFile, &rgelt[fetched]); - if (!SUCCEEDED(hr)) - { - for (i = 0; i < fetched; i++) - IRecycleBinFile_Release(rgelt[i]); - return hr; - } + hr = RecycleBin5File_Constructor(s->recycleBin, s->szPrefix, pDeletedFile, &rgelt[fetched]); + if (SUCCEEDED(hr)) + fetched++; pDeletedFile++; - fetched++; } s->dwCurrent = i; @@ -429,7 +443,7 @@ }; HRESULT -RecycleBin5_Enumerator_Constructor( +RecycleBin5Enum_Constructor( IN IRecycleBin5 *prb, IN HANDLE hInfo, IN HANDLE hInfoMapped,

17 years

[dreimer] 30810: Continue Work on Documentation. Add a missing MARCH setting.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Nov 27 10:22:31 2007 New Revision: 30810 URL: http://svn.reactos.org/svn/reactos?rev=30810&view=rev Log: Continue Work on Documentation. Add a missing MARCH setting. Added: trunk/tools/RosBE/RosBE-Windows/Documentation/files/config.html (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Added: trunk/tools/RosBE/RosBE-Windows/Documentation/files/config.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Document… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Documentation/files/config.html (added) +++ trunk/tools/RosBE/RosBE-Windows/Documentation/files/config.html Tue Nov 27 10:22:31 2007 @@ -1,0 +1,134 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Config</title> + <meta name="author" content="Daniel Reimer"> + <meta name="description" + content="Lists the Settings in the Config Script in RosBE"> +</head> +<body> +<dl> + <dt> + </dt> +</dl> + +<table style="text-align: left; width: 100%;" border="1" cellpadding="2" + cellspacing="2"> + <tbody> + <tr> + <td style="vertical-align: top;">i486</td> + <td style="vertical-align: top;">Intel's i486 CPU. (No scheduling +is implemented for this chip.) </td> + </tr> + <tr> + <td style="vertical-align: top;">i586, pentium</td> + <td style="vertical-align: top;">Intel Pentium CPU with no MMX +support. </td> + </tr> + <tr> + <td style="vertical-align: top;">pentium-mmx</td> + <td style="vertical-align: top;">Intel PentiumMMX CPU based on +Pentium core with MMX instruction set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">i686, pentiumpro</td> + <td style="vertical-align: top;">Intel PentiumPro CPU. </td> + </tr> + <tr> + <td style="vertical-align: top;">pentium2</td> + <td style="vertical-align: top;">Intel Pentium2 CPU based on +PentiumPro core with MMX instruction set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">pentium3, pentium3m</td> + <td style="vertical-align: top;">Intel Pentium3 CPU based on +PentiumPro core with MMX and SSE instruction set +support. </td> + </tr> + <tr> + <td style="vertical-align: top;">pentium-m</td> + <td style="vertical-align: top;">Low power version of Intel +Pentium3 CPU with MMX, SSE and SSE2 instruction set +support. Used by Centrino notebooks. </td> + </tr> + <tr> + <td style="vertical-align: top;">pentium4, pentium4m</td> + <td style="vertical-align: top;">Intel Pentium4 CPU with MMX, SSE +and SSE2 instruction set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">prescott</td> + <td style="vertical-align: top;">Improved version of Intel +Pentium4 CPU with MMX, SSE, SSE2 and SSE3 instruction +set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">nocona</td> + <td style="vertical-align: top;">Improved version of Intel +Pentium4 CPU with 64-bit extensions, MMX, SSE, +SSE2 and SSE3 instruction set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">k6</td> + <td style="vertical-align: top;">AMD K6 CPU with MMX instruction +set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">k6-2, k6-3</td> + <td style="vertical-align: top;">Improved versions of AMD K6 CPU +with MMX and 3dNOW! instruction set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">athlon, athlon-tbird</td> + <td style="vertical-align: top;">AMD Athlon CPU with MMX, 3dNOW!, +enhanced 3dNOW! and SSE prefetch instructions +support. </td> + </tr> + <tr> + <td style="vertical-align: top;">athlon-4, athlon-xp, +athlon-mp</td> + <td style="vertical-align: top;">Improved AMD Athlon CPU with +MMX, 3dNOW!, enhanced 3dNOW! and full SSE +instruction set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">k8, opteron, athlon64, +athlon-fx</td> + <td style="vertical-align: top;">AMD K8 core based CPUs with +x86-64 instruction set support. (This supersets +MMX, SSE, SSE2, 3dNOW!, enhanced 3dNOW! and 64-bit instruction set +extensions.) </td> + </tr> + <tr> + <td style="vertical-align: top;">winchip-c6</td> + <td style="vertical-align: top;">IDT Winchip C6 CPU, dealt in +same way as i486 with additional MMX instruction +set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">winchip2</td> + <td style="vertical-align: top;">IDT Winchip2 CPU, dealt in same +way as i486 with additional MMX and 3dNOW! instruction set support. </td> + </tr> + <tr> + <td style="vertical-align: top;">c3 + </td> + <td style="vertical-align: top;">Via C3 CPU with MMX and 3dNOW! +instruction set support. (No scheduling is +implemented for this chip.) </td> + </tr> + <tr> + <td style="vertical-align: top;">c3-2 + </td> + <td style="vertical-align: top;">Via C3-2 CPU with MMX and SSE +instruction set support. (No scheduling is +implemented for this chip.)</td> + </tr> + </tbody> +</table> + + + +</body> +</html> Propchange: trunk/tools/RosBE/RosBE-Windows/Documentation/files/config.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Tue Nov 27 10:22:31 2007 @@ -118,8 +118,8 @@ echo Which CPU ReactOS should be optimized for. echo. echo Examples: -echo Intel: i486, i586 / pentium, i686 / pentiumpro, pentium2, pentium3 / pentium3m -echo pentium-m, pentium4 / pentium4m, prescott, nocona +echo Intel: i486, i586 / pentium, pentium-mmx, i686 / pentiumpro, pentium2, pentium3 +echo pentium3m, pentium-m, pentium4 / pentium4m, prescott, nocona echo AMD: k6, k6-2 / k6-3, athlon / athlon-tbird, athlon-4 / athlon-xp / athlon-mp echo k8 / opteron / athlon64 / athlon-fx echo IDT: winchip-c6, winchip2

17 years

[jimtabor] 30809: Implement SetTextJustification. Add code for Window and Viewport Org and Ext. Setup SetRectRgn and added rgn_attr types.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 27 08:40:50 2007 New Revision: 30809 URL: http://svn.reactos.org/svn/reactos?rev=30809&view=rev Log: Implement SetTextJustification. Add code for Window and Viewport Org and Ext. Setup SetRectRgn and added rgn_attr types. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Tue Nov 27 08:40:50 2007 @@ -79,77 +79,6 @@ */ BOOL STDCALL -SetRectRgn(HRGN hrgn, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect) -{ - /* FIXME metadc stuff */ - return NtGdiSetRectRgn(hrgn, nLeftRect, nTopRect, nRightRect, nBottomRect); -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetViewportExtEx(HDC hdc, - int nXExtent, - int nYExtent, - LPSIZE lpSize) -{ - /* FIXME share memory */ - return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize); -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetWindowOrgEx(HDC hdc, - int X, - int Y, - LPPOINT lpPoint) -{ - /* FIXME share memory */ - return NtGdiSetWindowOrgEx(hdc,X,Y,lpPoint); -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetWindowExtEx(HDC hdc, - int nXExtent, - int nYExtent, - LPSIZE lpSize) -{ - /* FIXME share memory */ - return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize); -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetViewportOrgEx(HDC hdc, - int X, - int Y, - LPPOINT lpPoint) -{ - /* FIXME share memory */ - return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); -} - -/* - * @unimplemented - */ -BOOL -STDCALL PtInRegion(IN HRGN hrgn, int x, int y) @@ -396,22 +325,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetTextJustification( - HDC a0, - int a1, - int a2 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; } /* Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Tue Nov 27 08:40:50 2007 @@ -867,7 +867,7 @@ } if (pLDC->iType == LDC_EMFLDC) { - if return EMFDRV_SetBkColor( hDC, crColor ); + return EMFDRV_SetBkColor( hDC, crColor ); } } } @@ -924,7 +924,7 @@ } if (pLDC->iType == LDC_EMFLDC) { - if return EMFDRV_SetBkMode( hdc, iBkMode ) + return EMFDRV_SetBkMode( hdc, iBkMode ) } } } @@ -973,7 +973,7 @@ } if (pLDC->iType == LDC_EMFLDC) { - if return EMFDRV_SetPolyFillMode( hdc, iPolyFillMode ) + return EMFDRV_SetPolyFillMode( hdc, iPolyFillMode ) } } } @@ -1258,6 +1258,240 @@ //return NtGdiGetDCPoint( hdc, GdiGetWindowOrg, lpPoint ); } +/* + * @unimplemented + */ +BOOL +STDCALL +SetViewportExtEx(HDC hdc, + int nXExtent, + int nYExtent, + LPSIZE lpSize) +{ +#if 0 + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetViewportExtEx(); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetViewportExtEx(); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if (lpSize) + { + lpSize->cx = Dc_Attr->szlWindowExt.cx; + lpSize->cy = Dc_Attr->szlWindowExt.cy; + } + + if ((Dc_Attr->iMapMode == MM_ISOTROPIC) && (Dc_Attr->iMapMode == MM_ANISOTROPIC)) + { + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + + Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + Dc_Attr->szlWindowExt.cx = nXExtent; + Dc_Attr->szlWindowExt.cy = nYExtent; + } + return TRUE; +#endif + return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetWindowOrgEx(HDC hdc, + int X, + int Y, + LPPOINT lpPoint) +{ +#if 0 + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetWindowOrgEx(); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetWindowOrgEx(); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if (lpPoint) + { + lpPoint->x = Dc_Attr->ptlWindowOrg.x; + lpPoint->y = Dc_Attr->ptlWindowOrg.y; + } + + if ((Dc_Attr->ptlWindowOrg.x == X) && (Dc_Attr->ptlWindowOrg.y == Y)) + return TRUE; + + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + + Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + Dc_Attr->ptlWindowOrg.x = X; + Dc_Attr->ptlWindowOrg.y = Y; + return TRUE; +#endif + return NtGdiSetWindowOrgEx(hdc,X,Y,lpPoint); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetWindowExtEx(HDC hdc, + int nXExtent, + int nYExtent, + LPSIZE lpSize) +{ +#if 0 + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetWindowExtEx(); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetWindowExtEx(); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if (lpSize) + { + lpSize->cx = Dc_Attr->szlWindowExt.cx; + lpSize->cy = Dc_Attr->szlWindowExt.cy; + } + + if ((Dc_Attr->iMapMode == MM_ISOTROPIC) && (Dc_Attr->iMapMode == MM_ANISOTROPIC)) + { + if ((Dc_Attr->szlWindowExt.cx == nXExtent) && (Dc_Attr->szlWindowExt.cy == nYExtent)) + return TRUE; + + if ((!nXExtent) && (!nYExtent)) return FALSE; + + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + + Dc_Attr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + Dc_Attr->szlWindowExt.cx = nXExtent; + Dc_Attr->szlWindowExt.cy = nYExtent; + } + return TRUE; +#endif + return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetViewportOrgEx(HDC hdc, + int X, + int Y, + LPPOINT lpPoint) +{ +#if 0 + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetViewportOrgEx(); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetViewportOrgEx(); + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if (lpPoint) + { + lpPoint->x = Dc_Attr->ptlViewportOrg.x; + lpPoint->y = Dc_Attr->ptlViewportOrg.y; + } + Dc_Attr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + Dc_Attr->ptlViewportOrg.x = X; + Dc_Attr->ptlViewportOrg.y = Y; + return TRUE; +#endif + return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); +} + + + /* FIXME: include correct header */ HPALETTE STDCALL NtUserSelectPalette(HDC hDC, HPALETTE hpal, Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Tue Nov 27 08:40:50 2007 @@ -136,3 +136,54 @@ return NULL; } + +/* + * @implemented + */ +BOOL +STDCALL +SetRectRgn(HRGN hrgn, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect) +{ +#if 0 + PREGION_ATTR Rgn_Attr; + + if (!(GdiGetHandleUserData((HGDIOBJ) hrgn, (PVOID) &Rgn_Attr)) || + (GDI_HANDLE_GET_TYPE(hrgn) != GDI_OBJECT_TYPE_REGION)) +#endif + return NtGdiSetRectRgn(hrgn, nLeftRect, nTopRect, nRightRect, nBottomRect); +#if 0 + if ((nLeftRect == nRightRect) || (nTopRect == nBottomRect)) + { + Rgn_Attr->flFlags |= DIRTY_RGNATTR; + Rgn_Attr->dwType = RGNATTR_INIT; + Rgn_Attr->rcBound.left = Rgn_Attr->rcBound.top = + Rgn_Attr->rcBound.right = Rgn_Attr->rcBound.bottom = 0; + return TRUE; + } + + Rgn_Attr->rcBound.left = nLeftRect; + Rgn_Attr->rcBound.top = nTopRect; + Rgn_Attr->rcBound.right = nRightRect; + Rgn_Attr->rcBound.bottom = nBottomRect; + + if(nLeftRect > nRightRect) + { + Rgn_Attr->rcBound.left = nRightRect; + Rgn_Attr->rcBound.right = nLeftRect; + } + if(nTopRect > nBottomRect) + { + Rgn_Attr->rcBound.top = nBottomRect; + Rgn_Attr->rcBound.bottom = nTopRect; + } + + Rgn_Attr->flFlags |= DIRTY_RGNATTR; + Rgn_Attr->dwType = RGNATTR_SET; + return TRUE; +#endif +} + Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Tue Nov 27 08:40:50 2007 @@ -572,3 +572,41 @@ return OldColor; } +/* + * @implemented + */ +BOOL +STDCALL +SetTextJustification( + HDC hdc, + int extra, + int breaks + ) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; +#if 0 + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetTextJustification( hdc, extra, breaks ) + else + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } +#endif + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + Dc_Attr->cBreak = breaks; + Dc_Attr->lBreakExtra = extra; + return TRUE; +} + + Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Nov 27 08:40:50 2007 @@ -191,6 +191,15 @@ #define PAGE_XLATE_CHANGED 0x00002000 #define PAGE_EXTENTS_CHANGED 0x00004000 #define WORLD_XFORM_CHANGED 0x00008000 + + +/* RGN_ATTR Dirty Flags */ +#define DIRTY_RGNATTR 0x00000020 + +/* RGN_ATTR Type Flags */ +#define RGNATTR_INIT 0x00000001 +#define RGNATTR_SET 0x00000002 + /* TYPES *********************************************************************/ @@ -291,15 +300,11 @@ DWORD dwUnused[3]; } BRUSH_ATTR, *PBRUSH_ATTR; - typedef struct _REGION_ATTR { - DWORD dwUnknown1; - DWORD dwUnknown2; - LONG right; - LONG bottom; - LONG left; - LONG top; + FLONG flFlags; + DWORD dwType; + RECT rcBound; } REGION_ATTR, *PREGION_ATTR; typedef struct _FONT_ATTR

17 years

[weiden] 30808: Fix underline bug introduced in r30780

by weiden＠svn.reactos.org

Author: weiden Date: Tue Nov 27 04:33:16 2007 New Revision: 30808 URL: http://svn.reactos.org/svn/reactos?rev=30808&view=rev Log: Fix underline bug introduced in r30780 Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Nov 27 04:33:16 2007 @@ -3622,11 +3622,6 @@ /* FIXME: Handle fl */ - if (!Count) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } if (0 == Count) { Size.cx = 0;

17 years

[jimtabor] 30807: Revert 30780 for gdibatch. Size, space and time are very critical in here. If you dont know what your are doing? Do not play in here.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 27 04:14:38 2007 New Revision: 30807 URL: http://svn.reactos.org/svn/reactos?rev=30807&view=rev Log: Revert 30780 for gdibatch. Size, space and time are very critical in here. If you dont know what your are doing? Do not play in here. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Tue Nov 27 04:14:38 2007 @@ -20,7 +20,6 @@ { PDC dc = NULL; PDC_ATTR Dc_Attr = NULL; - PGDIBSSETBRHORG pgSBO; if (hDC) { dc = DC_LockDc(hDC); @@ -40,6 +39,7 @@ break; case GdiBCSetBrushOrg: { + PGDIBSSETBRHORG pgSBO; if (!dc) break; pgSBO = (PGDIBSSETBRHORG) pHdr; Dc_Attr->ptlBrushOrigin = pgSBO->ptlBrushOrigin;

17 years

[jimtabor] 30806: Removed NtGdiGet/Set/GraphicsMode/PolyFillMode/MapMode, update all related files. Tested with Qemu and AbiWord. The underline problem is pre rev 30783.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 27 04:01:39 2007 New Revision: 30806 URL: http://svn.reactos.org/svn/reactos?rev=30806&view=rev Log: Removed NtGdiGet/Set/GraphicsMode/PolyFillMode/MapMode, update all related files. Tested with Qemu and AbiWord. The underline problem is pre rev 30783. Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Tue Nov 27 04:01:39 2007 @@ -9,35 +9,6 @@ * Api that are hacked but we can not do correct implemtions yetm but using own syscall * */ - -/* - * @implemented - * - */ -int -STDCALL -GetPolyFillMode(HDC hdc) -{ - /* FIXME do not use reactos own syscall for this, - * this hack need be remove - */ - return NtGdiGetPolyFillMode(hdc); -} - - -/* - * @implemented - * - */ -int -STDCALL -GetGraphicsMode(HDC hdc) -{ - /* FIXME do not use reactos own syscall for this, - * this hack need be remove - */ - return NtGdiGetGraphicsMode(hdc); -} /* * @implemented @@ -89,18 +60,6 @@ return NtGdiSelectObject(hdc,hgdiobj); } - -/* - * @implemented - * - */ -int -STDCALL -GetMapMode(HDC hdc) -{ - return NtGdiGetMapMode(hdc); -} - /* * @implemented * Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Tue Nov 27 04:01:39 2007 @@ -68,30 +68,6 @@ */ int STDCALL -SetGraphicsMode(HDC hdc, - int iMode) -{ - /* FIXME share memory */ - return NtGdiSetGraphicsMode(hdc, iMode); -} - -/* - * @unimplemented - */ -int -STDCALL -SetPolyFillMode(HDC hdc, - int iPolyFillMode) -{ - /* FIXME share memory */ - return NtGdiSetPolyFillMode(hdc, iPolyFillMode); -} - -/* - * @unimplemented - */ -int -STDCALL SetStretchBltMode(HDC hdc, int iStretchMode) { /* FIXME share memory */ @@ -274,23 +250,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - -/* - * @unimplemented - */ -HRGN -STDCALL -ExtCreateRegion( - CONST XFORM * a0, - DWORD a1, - CONST RGNDATA * a2 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Tue Nov 27 04:01:39 2007 @@ -910,9 +910,9 @@ if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return OldMode; #if 0 - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) return MFDRV_SetBkMode( hdc, iBkMode ) else { @@ -937,6 +937,112 @@ /* * @implemented + * + */ +int +STDCALL +GetPolyFillMode(HDC hdc) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + return Dc_Attr->lFillMode; +} + +/* + * @unimplemented + */ +int +STDCALL +SetPolyFillMode(HDC hdc, + int iPolyFillMode) +{ + INT fmode; + PDC_ATTR Dc_Attr; +#if 0 + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetPolyFillMode( hdc, iPolyFillMode ) + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + if return EMFDRV_SetPolyFillMode( hdc, iPolyFillMode ) + } + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + { + if (Dc_Attr->ulDirty_ & DC_MODE_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + + fmode = Dc_Attr->lFillMode; + Dc_Attr->lFillMode = iPolyFillMode; + + return fmode; +} + +/* + * @implemented + * + */ +int +STDCALL +GetGraphicsMode(HDC hdc) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + return Dc_Attr->iGraphicsMode; +} + +/* + * @unimplemented + */ +int +STDCALL +SetGraphicsMode(HDC hdc, + int iMode) +{ + INT oMode; + PDC_ATTR Dc_Attr; + if ((iMode < GM_COMPATIBLE) || (iMode > GM_ADVANCED)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + + if (iMode == Dc_Attr->iGraphicsMode) return iMode; + + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + { + if (Dc_Attr->ulDirty_ & DC_MODE_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + oMode = Dc_Attr->iGraphicsMode; + Dc_Attr->iGraphicsMode = iMode; + + return oMode; +} + +/* + * @implemented */ HDC STDCALL @@ -1164,7 +1270,40 @@ HPALETTE hPal, BOOL bForceBackground) { +#if 0 + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SelectPalette( hDC, hPal, bForceBackground); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + if return EMFDRV_SelectPalette( hDC, hPal, bForceBackground); + } + } + } +#endif return NtUserSelectPalette(hDC, hPal, bForceBackground); +} + +/* + * @implemented + * + */ +int +STDCALL +GetMapMode(HDC hdc) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + return Dc_Attr->iMapMode; } /* @@ -1177,6 +1316,20 @@ INT Mode ) { + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; +#if 0 + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetMapMode(hdc, Mode); + else + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } +#endif + if ((Mode == Dc_Attr->iMapMode) && (Mode != MM_ISOTROPIC)) return Mode; return GetAndSetDCDWord( hdc, GdiGetSetMapMode, Mode, 0, 0, 0 ); } Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Tue Nov 27 04:01:39 2007 @@ -112,3 +112,27 @@ return NtGdiDeleteObjectApp((HGDIOBJ) hRgn); } +/* + * @implemented + */ +HRGN +STDCALL +ExtCreateRegion( + CONST XFORM * lpXform, + DWORD nCount, + CONST RGNDATA * lpRgnData + ) +{ + if (lpRgnData) + { + if ((!lpXform) && (lpRgnData->rdh.nCount == 1)) + { + PRECT pRect = (PRECT)&lpRgnData->Buffer[0]; + return CreateRectRgn(pRect->left, pRect->top, pRect->right, pRect->bottom); + } + return NtGdiExtCreateRegion((LPXFORM) lpXform, nCount,(LPRGNDATA) lpRgnData); + } + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; +} + Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Tue Nov 27 04:01:39 2007 @@ -257,11 +257,6 @@ NtGdiGetFontLanguageInfo(HDC hDC); /* Should be done in user-mode. */ -int -STDCALL -NtGdiGetGraphicsMode ( HDC hDC ); - -/* Should be done in user-mode. */ BOOL STDCALL NtGdiGetICMProfile(HDC hDC, @@ -274,17 +269,11 @@ NtGdiGetLogColorSpace(HCOLORSPACE hColorSpace, LPLOGCOLORSPACEW Buffer, DWORD Size); - -/* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetMapMode(HDC hDC); - + /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetPixelFormat(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetPolyFillMode(HDC hDC); /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetStretchBltMode(HDC hDC); @@ -388,14 +377,6 @@ CONST PBYTE Data ); -/* Needs to be done in user-mode, using shared GDI Object Attributes. */ -int -STDCALL -NtGdiSetGraphicsMode ( - HDC hDC, - int Mode - ); - /* Should be done in user-mode. */ BOOL STDCALL @@ -407,9 +388,6 @@ STDCALL NtGdiSetMapperFlags(HDC hDC, DWORD Flag); - -/* Needs to be done in user-mode, using shared GDI Object Attributes. */ -INT STDCALL NtGdiSetPolyFillMode(HDC hDC, INT polyFillMode); /* Needs to be done in user-mode, using shared GDI Object Attributes. */ INT STDCALL NtGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Tue Nov 27 04:01:39 2007 @@ -52,7 +52,7 @@ Dc_Attr->ptlCurrent.x = X; Dc_Attr->ptlCurrent.y = Y; Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent; - IntLPtoDP(dc, &Dc_Attr->ptfxCurrent, 1); // Update fx + CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); PathIsOpen = PATH_IsPathOpen(dc->w.path); @@ -76,7 +76,7 @@ if (Dc_Attr->ulDirty_ & DIRTY_PTFXCURRENT) { Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent; - IntLPtoDP(dc, &Dc_Attr->ptfxCurrent, 1); // Update fx + CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx Dc_Attr->ulDirty_ &= ~(DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); } pt->x = Dc_Attr->ptlCurrent.x; @@ -108,7 +108,7 @@ Dc_Attr->ptlCurrent.x = XEnd; Dc_Attr->ptlCurrent.y = YEnd; Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent; - IntLPtoDP(dc, &Dc_Attr->ptfxCurrent, 1); // Update fx + CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); } return Ret; @@ -166,7 +166,7 @@ Dc_Attr->ptlCurrent.x = XEnd; Dc_Attr->ptlCurrent.y = YEnd; Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent; - IntLPtoDP(dc, &Dc_Attr->ptfxCurrent, 1); // Update fx + CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); } @@ -230,7 +230,7 @@ Dc_Attr->ptlCurrent.x = pt[Count-1].x; Dc_Attr->ptlCurrent.y = pt[Count-1].y; Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent; - IntLPtoDP(dc, &Dc_Attr->ptfxCurrent, 1); // Update fx + CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); } @@ -327,7 +327,7 @@ Dc_Attr->ptlCurrent.x = pt[Count-1].x; Dc_Attr->ptlCurrent.y = pt[Count-1].y; Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent; - IntLPtoDP(dc, &Dc_Attr->ptfxCurrent, 1); // Update fx + CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); } Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Nov 27 04:01:39 2007 @@ -681,10 +681,8 @@ NtGdiSelectObject 2 NtGdiSetDIBits 7 NtGdiSetEnhMetaFileBits 2 -NtGdiSetGraphicsMode 2 NtGdiSetICMProfile 2 NtGdiSetMapperFlags 2 -NtGdiSetPolyFillMode 2 NtGdiSetStretchBltMode 2 NtGdiSetViewportExtEx 4 NtGdiSetViewportOrgEx 4 @@ -748,12 +746,9 @@ NtGdiGetEnhMetaFilePixelFormat 3 NtGdiGetFontFamilyInfo 4 NtGdiGetFontLanguageInfo 1 -NtGdiGetGraphicsMode 1 NtGdiGetICMProfile 3 NtGdiGetLogColorSpace 3 -NtGdiGetMapMode 1 NtGdiGetPixelFormat 1 -NtGdiGetPolyFillMode 1 NtGdiGetStretchBltMode 1 NtGdiGetTextExtentPoint32 4 NtGdiOffsetViewportOrgEx 4

17 years

[mpiulachs] 30805: - updated blankscr.scr file name to scrnsave.scr

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Tue Nov 27 03:58:24 2007 New Revision: 30805 URL: http://svn.reactos.org/svn/reactos?rev=30805&view=rev Log: - updated blankscr.scr file name to scrnsave.scr Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Nov 27 03:58:24 2007 @@ -463,7 +463,7 @@ modules\rosapps\avtest\avtest.sys 1 optional modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional -modules\rosapps\applications\screensavers\blankscr\blankscr.scr 1 optional +modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional modules\rosapps\cmdutils\comp\comp.exe 1 optional

17 years

[mpiulachs] 30804: - Change blankscr installname attribute to scrnsave.scr as it's the name it has the equivalent component on MS Windows.

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Tue Nov 27 03:57:09 2007 New Revision: 30804 URL: http://svn.reactos.org/svn/reactos?rev=30804&view=rev Log: - Change blankscr installname attribute to scrnsave.scr as it's the name it has the equivalent component on MS Windows. Modified: trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild Modified: trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild (original) +++ trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild Tue Nov 27 03:57:09 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="blankscr" type="win32scr" installbase="system32" installname="blankscr.scr"> +<module name="blankscr" type="win32scr" installbase="system32" installname="scrnsave.scr"> <importlibrary definition="scrnsave.def" /> <library>scrnsave</library> <library>kernel32</library>

17 years

[mpiulachs] 30803: - Do not use module (name + extension) as default target if installname attribute is present , use the value of it inset.

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Tue Nov 27 03:56:25 2007 New Revision: 30803 URL: http://svn.reactos.org/svn/reactos?rev=30803&view=rev Log: - Do not use module (name + extension) as default target if installname attribute is present , use the value of it inset. Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Nov 27 03:56:25 2007 @@ -283,11 +283,6 @@ else extension = GetDefaultModuleExtension (); - output = new FileLocation ( GetTargetDirectoryTree (), - modulePath, - name + extension, - &moduleNode ); - att = moduleNode.GetAttribute ( "unicode", false ); if ( att != NULL ) { @@ -416,9 +411,20 @@ installbase ? installbase->value : "", att->value, &moduleNode ); - } - else + + output = new FileLocation ( GetTargetDirectoryTree (), + modulePath, + att->value, + &moduleNode ); + } + else + { install = NULL; + output = new FileLocation ( GetTargetDirectoryTree (), + modulePath, + name + extension, + &moduleNode ); + } att = moduleNode.GetAttribute ( "allowwarnings", false ); if ( att == NULL )

17 years

← Newer
1
...
9
10
11
12
13
14
15
...
89
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007