Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/11: [NTOS:FSRTL] Assign the buffer length to ThisBufferLength field
by George Bișoc 11 Jan '22

11 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abe89d7cdecd173628f6f… commit abe89d7cdecd173628f6fa67819547887a085664 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Jan 1 20:23:28 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Jan 11 10:11:08 2022 +0100 [NTOS:FSRTL] Assign the buffer length to ThisBufferLength field This fixes an issue where ReactOS would assert on QuotaUsage == 0 as the process was still taking up quotas during a quota block de-reference with root cause of ThisBufferLength member field being 0 which made process quota charging/returning flow unbalanced. In addition to that, on FsRtlCancelNotify routine API all we must ensure that if PsChargePoolQuota or ExAllocatePoolWithTag function fails we have to handle the raised exceptions accordingly and return the charged quota back (if we actually charged quotas that is). With said, wrap that part of code with SEH. === DOCUMENTATION REMARKS === The cause of the assert is due to the fact ThisBufferLength was being handled wrongly ever since, until this commit. When FsRtl of the Executive has to filter reported changes (with logic algorithm implemented in FsRtlNotifyFilterReportChange function), the said function will charge the quota of a given process with an amount that is represented as the buffer length whose size is expressed in bytes. This length buffer is preserved in a local variable called NumberOfBytes, which is initialized from BufferLength member field of notification structure or from the length from stack parameters pointed from an IRP. As it currently stands, the code is implemented in such a way that FsRtlNotifyFilterReportChange will charge quotas to a process but it doesn't assign the buffer length to ThisBufferLength. On the first glimpse ThisBufferLength and BufferLength are very similar members that serve exact same purpose but in reality there's a subtle distinction between the two. BufferLength is a member whose length size is given by FSDs (filesystem drivers) during a notification dispatching. Whenever FsRtl receives the notification structure packed with data from the filesystem, the length pointed by BufferLength gets passed to ThisBufferLength and from now on the kernel has to use this member for the whole time of its task to accomplish whatever request it's been given by the filesystem. In other words, BufferLength is strictly used only to pass length size data to the kernel by initializing ThisBufferLength based on that length and unequivocally the kernel uses this member field. What we're doing is that ThisBufferLength never receives the length from BufferLength therefore whenever FsRtl component has to return quotas back it'll return an amount of 0 (which means no amount to return) and that's a bug in the kernel. --- ntoskrnl/fsrtl/notify.c | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/fsrtl/notify.c b/ntoskrnl/fsrtl/notify.c index e7b73771232..f69475c9984 100644 --- a/ntoskrnl/fsrtl/notify.c +++ b/ntoskrnl/fsrtl/notify.c @@ -85,6 +85,7 @@ FsRtlCancelNotify(IN PDEVICE_OBJECT DeviceObject, PIO_STACK_LOCATION Stack; PNOTIFY_CHANGE NotifyChange; PREAL_NOTIFY_SYNC RealNotifySync; + BOOLEAN PoolQuotaCharged; PSECURITY_SUBJECT_CONTEXT _SEH2_VOLATILE SubjectContext = NULL; /* Get the NOTIFY_CHANGE struct and reset it */ @@ -165,15 +166,38 @@ FsRtlCancelNotify(IN PDEVICE_OBJECT DeviceObject, /* If we have a buffer length, but no buffer then allocate one */ if (Buffer == NULL) { - PsChargePoolQuota(NotifyChange->OwningProcess, PagedPool, BufferLength); - Buffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, BufferLength, TAG_FS_NOTIFICATIONS); - NotifyChange->AllocatedBuffer = Buffer; - } + /* Assume we haven't charged quotas */ + PoolQuotaCharged = FALSE; - /* Copy data in that buffer */ - RtlCopyMemory(Buffer, NotifyChange->Buffer, NotifyChange->DataLength); - NotifyChange->ThisBufferLength = BufferLength; - NotifyChange->Buffer = Buffer; + _SEH2_TRY + { + /* Charge quotas */ + PsChargePoolQuota(NotifyChange->OwningProcess, PagedPool, BufferLength); + PoolQuotaCharged = TRUE; + + /* Allocate buffer */ + Buffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, BufferLength, TAG_FS_NOTIFICATIONS); + NotifyChange->AllocatedBuffer = Buffer; + + /* Copy data in that buffer */ + RtlCopyMemory(Buffer, NotifyChange->Buffer, NotifyChange->DataLength); + NotifyChange->ThisBufferLength = BufferLength; + NotifyChange->Buffer = Buffer; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Something went wrong, have we charged quotas? */ + if (PoolQuotaCharged) + { + /* We did, return quotas */ + PsReturnProcessPagedPoolQuota(NotifyChange->OwningProcess, BufferLength); + } + + /* And notify immediately */ + NotifyChange->Flags |= NOTIFY_IMMEDIATELY; + } + _SEH2_END; + } } /* If we have to notify immediately, ensure that any buffer is 0-ed out */ @@ -1322,10 +1346,15 @@ FsRtlNotifyFilterReportChange(IN PNOTIFY_SYNC NotifySync, /* If we couldn't find one, then allocate one */ if (NotifyChange->Buffer == NULL) { + /* Assign the length buffer */ + NotifyChange->ThisBufferLength = NumberOfBytes; + + /* Assume we have not charged quotas */ PoolQuotaCharged = FALSE; _SEH2_TRY { - PsChargePoolQuota(NotifyChange->OwningProcess, PagedPool, NumberOfBytes); + /* And charge quotas */ + PsChargePoolQuota(NotifyChange->OwningProcess, PagedPool, NotifyChange->ThisBufferLength); PoolQuotaCharged = TRUE; OutputBuffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, NumberOfBytes, TAG_FS_NOTIFICATIONS); @@ -1337,7 +1366,7 @@ FsRtlNotifyFilterReportChange(IN PNOTIFY_SYNC NotifySync, { if (PoolQuotaCharged) { - PsReturnProcessPagedPoolQuota(NotifyChange->OwningProcess, NumberOfBytes); + PsReturnProcessPagedPoolQuota(NotifyChange->OwningProcess, NotifyChange->ThisBufferLength); } NotifyChange->Flags |= NOTIFY_IMMEDIATELY; }

1 0

[reactos] 02/11: [NTOS:EX] Manage quotas when allocating or freeing pool tables
by George Bișoc 11 Jan '22

11 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71a4921f8ab706f81264e… commit 71a4921f8ab706f81264e53df5dacd241c8c22f1 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Dec 30 21:05:27 2021 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Jan 11 10:11:08 2022 +0100 [NTOS:EX] Manage quotas when allocating or freeing pool tables This fixes an assertion where QuotaUsage == 0 is actually not 0 when a process is about to be destroyed. --- ntoskrnl/ex/handle.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index be4406bc56a..94b345caeb3 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -102,6 +102,7 @@ ExpAllocateTablePagedPool(IN PEPROCESS Process OPTIONAL, IN SIZE_T Size) { PVOID Buffer; + NTSTATUS Status; /* Do the allocation */ Buffer = ExAllocatePoolWithTag(PagedPool, Size, TAG_OBJECT_TABLE); @@ -113,7 +114,13 @@ ExpAllocateTablePagedPool(IN PEPROCESS Process OPTIONAL, /* Check if we have a process to charge quota */ if (Process) { - /* FIXME: Charge quota */ + /* Charge quota */ + Status = PsChargeProcessPagedPoolQuota(Process, Size); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Buffer, TAG_OBJECT_TABLE); + return NULL; + } } } @@ -127,6 +134,7 @@ ExpAllocateTablePagedPoolNoZero(IN PEPROCESS Process OPTIONAL, IN SIZE_T Size) { PVOID Buffer; + NTSTATUS Status; /* Do the allocation */ Buffer = ExAllocatePoolWithTag(PagedPool, Size, TAG_OBJECT_TABLE); @@ -135,7 +143,13 @@ ExpAllocateTablePagedPoolNoZero(IN PEPROCESS Process OPTIONAL, /* Check if we have a process to charge quota */ if (Process) { - /* FIXME: Charge quota */ + /* Charge quota */ + Status = PsChargeProcessPagedPoolQuota(Process, Size); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Buffer, TAG_OBJECT_TABLE); + return NULL; + } } } @@ -153,7 +167,8 @@ ExpFreeTablePagedPool(IN PEPROCESS Process OPTIONAL, ExFreePoolWithTag(Buffer, TAG_OBJECT_TABLE); if (Process) { - /* FIXME: Release quota */ + /* Release quota */ + PsReturnProcessPagedPoolQuota(Process, Size); } } @@ -248,7 +263,8 @@ ExpFreeHandleTable(IN PHANDLE_TABLE HandleTable) ExFreePoolWithTag(HandleTable, TAG_OBJECT_TABLE); if (Process) { - /* FIXME: TODO */ + /* Release the quota it was taking up */ + PsReturnProcessPagedPoolQuota(Process, sizeof(HANDLE_TABLE)); } } @@ -312,6 +328,7 @@ ExpAllocateHandleTable(IN PEPROCESS Process OPTIONAL, PHANDLE_TABLE HandleTable; PHANDLE_TABLE_ENTRY HandleTableTable, HandleEntry; ULONG i; + NTSTATUS Status; PAGED_CODE(); /* Allocate the table */ @@ -323,7 +340,13 @@ ExpAllocateHandleTable(IN PEPROCESS Process OPTIONAL, /* Check if we have a process */ if (Process) { - /* FIXME: Charge quota */ + /* Charge quota */ + Status = PsChargeProcessPagedPoolQuota(Process, sizeof(HANDLE_TABLE)); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(HandleTable, TAG_OBJECT_TABLE); + return NULL; + } } /* Clear the table */ @@ -335,6 +358,13 @@ ExpAllocateHandleTable(IN PEPROCESS Process OPTIONAL, { /* Failed, free the table */ ExFreePoolWithTag(HandleTable, TAG_OBJECT_TABLE); + + /* Return the quota it was taking up */ + if (Process) + { + PsReturnProcessPagedPoolQuota(Process, sizeof(HANDLE_TABLE)); + } + return NULL; }

1 0

[reactos] 01/11: [NTOSKRNL] Implement InterlockedExchangeSizeT macro
by George Bișoc 11 Jan '22

11 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47cb3c20a3cf809ebec05… commit 47cb3c20a3cf809ebec052f1a5c84f693c1efa98 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jan 2 20:21:22 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Jan 11 10:10:56 2022 +0100 [NTOSKRNL] Implement InterlockedExchangeSizeT macro --- ntoskrnl/include/internal/ex.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 2b8b0026794..a8273001523 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -1537,6 +1537,14 @@ XIPInit( #define InterlockedCompareExchangeSizeT(Destination, Exchange, Comperand) \ (SIZE_T)InterlockedCompareExchangePointer((PVOID*)(Destination), (PVOID)(SIZE_T)(Exchange), (PVOID)(SIZE_T)(Comperand)) +#ifdef _WIN64 +#define InterlockedExchangeSizeT(Target, Value) \ + (SIZE_T)InterlockedExchange64((PLONG64)Target, (LONG64)Value) +#else +#define InterlockedExchangeSizeT(Target, Value) \ + (SIZE_T)InterlockedExchange((PLONG)Target, (LONG)Value) +#endif + #define ExfInterlockedCompareExchange64UL(Destination, Exchange, Comperand) \ (ULONGLONG)ExfInterlockedCompareExchange64((PLONGLONG)(Destination), (PLONGLONG)(Exchange), (PLONGLONG)(Comperand))

1 0

[reactos] 01/01: [SHELL32] Fix folders on recycle bin and adjust the column size (#4234)
by Jesús Sanz del Rey 10 Jan '22

10 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47f6745bcdfb833b0311e… commit 47f6745bcdfb833b0311e052f04e6cd5634660eb Author: Jesús Sanz del Rey <jesussanz2003(a)gmail.com> AuthorDate: Tue Jan 11 00:40:25 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 11 00:40:25 2022 +0100 [SHELL32] Fix folders on recycle bin and adjust the column size (#4234) CORE-11000 - Now, folders can be sent to recycle bin (fixed a bug inside the implementation). - Adjust column size of the RecycleBin virtual folder in details mode. --- dll/win32/shell32/folders/CRecycleBin.cpp | 39 ++++++++++++--------- dll/win32/shell32/shellrecyclebin/recyclebin.c | 28 ++++++++++++++- dll/win32/shell32/shellrecyclebin/recyclebin.h | 10 ++++++ dll/win32/shell32/shellrecyclebin/recyclebin_v5.c | 2 +- .../shellrecyclebin/recyclebin_v5_enumerator.c | 40 +++++++++++++++++++++- 5 files changed, 99 insertions(+), 20 deletions(-) diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index cba7c52e42e..48d285c9ac7 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -39,14 +39,14 @@ typedef struct static const columninfo RecycleBinColumns[] = { - {IDS_SHV_COLUMN_NAME, &FMTID_Storage, PID_STG_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, - {IDS_SHV_COLUMN_DELFROM, &FMTID_Displaced, PID_DISPLACED_FROM, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, - {IDS_SHV_COLUMN_DELDATE, &FMTID_Displaced, PID_DISPLACED_DATE, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20}, - {IDS_SHV_COLUMN_SIZE, &FMTID_Storage, PID_STG_SIZE, SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 20}, - {IDS_SHV_COLUMN_TYPE, &FMTID_Storage, PID_STG_STORAGETYPE, SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20}, - {IDS_SHV_COLUMN_MODIFIED, &FMTID_Storage, PID_STG_WRITETIME, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20}, - /* {"creation time", &FMTID_Storage, PID_STG_CREATETIME, SHCOLSTATE_TYPE_DATE, LVCFMT_LEFT, 20}, */ - /* {"attribs", &FMTID_Storage, PID_STG_ATTRIBUTES, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 20}, */ + {IDS_SHV_COLUMN_NAME, &FMTID_Storage, PID_STG_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 25}, + {IDS_SHV_COLUMN_DELFROM, &FMTID_Displaced, PID_DISPLACED_FROM, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 35}, + {IDS_SHV_COLUMN_DELDATE, &FMTID_Displaced, PID_DISPLACED_DATE, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_SIZE, &FMTID_Storage, PID_STG_SIZE, SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, + {IDS_SHV_COLUMN_TYPE, &FMTID_Storage, PID_STG_STORAGETYPE, SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + {IDS_SHV_COLUMN_MODIFIED, &FMTID_Storage, PID_STG_WRITETIME, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, + /* {"creation time", &FMTID_Storage, PID_STG_CREATETIME, SHCOLSTATE_TYPE_DATE, LVCFMT_LEFT, 20}, */ + /* {"attribs", &FMTID_Storage, PID_STG_ATTRIBUTES, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 20}, */ }; #define COLUMN_NAME 0 @@ -745,21 +745,26 @@ HRESULT WINAPI CRecycleBin::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, LPS FormatDateTime(buffer, MAX_PATH, &pFileDetails->LastModification); break; case COLUMN_TYPE: - // FIXME: We should in fact use a UNICODE version of _ILGetFileType - szTypeName[0] = L'\0'; - wcscpy(buffer, PathFindExtensionW(pFileDetails->szName)); - if (!( HCR_MapTypeToValueW(buffer, buffer, _countof(buffer), TRUE) && - HCR_MapTypeToValueW(buffer, szTypeName, _countof(szTypeName), FALSE ))) { + SEARCH_CONTEXT Context; + Context.pFileDetails = pFileDetails; + Context.bFound = FALSE; + EnumerateRecycleBinW(NULL, CBSearchRecycleBin, (PVOID)&Context); + + if (Context.bFound) + { + GetDeletedFileTypeNameW(Context.hDeletedFile, buffer, _countof(buffer), NULL); + + CloseRecycleBinHandle(Context.hDeletedFile); + } /* load localized file string */ - szTypeName[0] = '\0'; - if(LoadStringW(shell32_hInstance, IDS_ANY_FILE, szTypeName, _countof(szTypeName))) + else if (LoadStringW(shell32_hInstance, IDS_ANY_FILE, szTypeName, _countof(szTypeName))) { - szTypeName[63] = '\0'; StringCchPrintfW(buffer, _countof(buffer), szTypeName, PathFindExtensionW(pFileDetails->szName)); } + + return SHSetStrRet(&pDetails->str, buffer); } - return SHSetStrRet(&pDetails->str, szTypeName); default: return E_FAIL; } diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin.c b/dll/win32/shell32/shellrecyclebin/recyclebin.c index 50d06a9608c..a6392496012 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin.c @@ -3,7 +3,7 @@ * LICENSE: GPL v2 - See COPYING in the top level directory * FILE: lib/recyclebin/recyclebin.c * PURPOSE: Public interface - * PROGRAMMERS: Copyright 2006-2007 Herv� Poussineau (hpoussin(a)reactos.org) + * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) */ #include "recyclebin_private.h" @@ -252,6 +252,32 @@ cleanup: return FALSE; } +BOOL WINAPI +GetDeletedFileTypeNameW( + IN HANDLE hDeletedFile, + OUT LPWSTR pTypeName, + IN DWORD BufferSize, + OUT LPDWORD RequiredSize OPTIONAL) +{ + IRecycleBinFile *prbf = (IRecycleBinFile *)hDeletedFile; + SIZE_T FinalSize; + + HRESULT hr = IRecycleBinFile_GetTypeName(prbf, BufferSize, pTypeName, &FinalSize); + + if (SUCCEEDED(hr)) + { + if (RequiredSize) + *RequiredSize = (DWORD)FinalSize; + + return TRUE; + } + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + SetLastError(HRESULT_CODE(hr)); + else + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + BOOL WINAPI GetDeletedFileDetailsA( IN HANDLE hDeletedFile, diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin.h b/dll/win32/shell32/shellrecyclebin/recyclebin.h index 2fa2d00139b..50c020c839f 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin.h +++ b/dll/win32/shell32/shellrecyclebin/recyclebin.h @@ -131,6 +131,13 @@ EnumerateRecycleBinW( #define EnumerateRecycleBin EnumerateRecycleBinA #endif +BOOL WINAPI +GetDeletedFileTypeNameW( + IN HANDLE hDeletedFile, + OUT LPWSTR pTypeName, + IN DWORD BufferSize, + OUT LPDWORD RequiredSize OPTIONAL); + /* Gets details about a deleted file * hDeletedFile: handle of the deleted file to get details about * BufferSize: size of the 'FileDetails' buffer, in bytes @@ -196,6 +203,7 @@ DECLARE_INTERFACE_(IRecycleBinFile, IUnknown) STDMETHOD(GetPhysicalFileSize)(THIS_ ULARGE_INTEGER *pPhysicalFileSize) PURE; STDMETHOD(GetAttributes)(THIS_ DWORD *pAttributes) PURE; STDMETHOD(GetFileName)(THIS_ SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) PURE; + STDMETHOD(GetTypeName)(THIS_ SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) PURE; STDMETHOD(Delete)(THIS) PURE; STDMETHOD(Restore)(THIS) PURE; @@ -264,6 +272,8 @@ EXTERN_C const IID IID_IRecycleBin; (This)->lpVtbl->GetAttributes(This, pAttributes) #define IRecycleBinFile_GetFileName(This, BufferSize, Buffer, RequiredSize) \ (This)->lpVtbl->GetFileName(This, BufferSize, Buffer, RequiredSize) +#define IRecycleBinFile_GetTypeName(This, BufferSize, Buffer, RequiredSize) \ + (This)->lpVtbl->GetTypeName(This, BufferSize, Buffer, RequiredSize) #define IRecycleBinFile_Delete(This) \ (This)->lpVtbl->Delete(This) #define IRecycleBinFile_Restore(This) \ diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c index 5bbd9548997..3344b2c035c 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c @@ -234,7 +234,7 @@ RecycleBin5_RecycleBin5_DeleteFile( return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } - hFile = CreateFileW(szFullName, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + hFile = CreateFileW(szFullName, 0, 0, NULL, OPEN_EXISTING, (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_FLAG_BACKUP_SEMANTICS : 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { hr = HRESULT_FROM_WIN32(GetLastError()); diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c index 7e5814af174..bbe4fa1e834 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c @@ -3,7 +3,7 @@ * LICENSE: GPL v2 - See COPYING in the top level directory * FILE: lib/recyclebin/recyclebin_v5_enumerator.c * PURPOSE: Enumerates contents of a MS Windows 2000/XP/2003 recyclebin - * PROGRAMMERS: Copyright 2006-2007 Herv� Poussineau (hpoussin(a)reactos.org) + * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) */ #include "recyclebin_private.h" @@ -210,6 +210,43 @@ RecycleBin5File_RecycleBinFile_GetFileName( return S_OK; } +static HRESULT STDMETHODCALLTYPE +RecycleBin5File_RecycleBinFile_GetTypeName( + IN IRecycleBinFile *This, + IN SIZE_T BufferSize, + IN OUT LPWSTR Buffer, + OUT SIZE_T *RequiredSize) +{ + HRESULT hr; + + struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); + DWORD dwRequired; + DWORD dwAttributes; + SHFILEINFOW shFileInfo; + + TRACE("(%p, %u, %p, %p)\n", This, BufferSize, Buffer, RequiredSize); + + hr = RecycleBin5File_RecycleBinFile_GetAttributes(This, &dwAttributes); + if (!SUCCEEDED(hr)) + return hr; + + hr = SHGetFileInfoW(s->FullName, dwAttributes, &shFileInfo, sizeof(shFileInfo), SHGFI_TYPENAME | SHGFI_USEFILEATTRIBUTES); + if (!SUCCEEDED(hr)) + return hr; + + dwRequired = (DWORD)(wcslen(shFileInfo.szTypeName) + 1) * sizeof(WCHAR); + if (RequiredSize) + *RequiredSize = dwRequired; + + if (BufferSize == 0 && !Buffer) + return S_OK; + + if (BufferSize < dwRequired) + return E_OUTOFMEMORY; + CopyMemory(Buffer, shFileInfo.szTypeName, dwRequired); + return S_OK; +} + static HRESULT STDMETHODCALLTYPE RecycleBin5File_RecycleBinFile_Delete( IN IRecycleBinFile *This) @@ -239,6 +276,7 @@ CONST_VTBL struct IRecycleBinFileVtbl RecycleBin5FileVtbl = RecycleBin5File_RecycleBinFile_GetPhysicalFileSize, RecycleBin5File_RecycleBinFile_GetAttributes, RecycleBin5File_RecycleBinFile_GetFileName, + RecycleBin5File_RecycleBinFile_GetTypeName, RecycleBin5File_RecycleBinFile_Delete, RecycleBin5File_RecycleBinFile_Restore, };

1 0

[reactos] 01/01: [SHELL32] Fix recycle bin handle reference leaking (#4222)
by Jesús Sanz del Rey 10 Jan '22

10 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dae6035b3b3a0e21a61ea… commit dae6035b3b3a0e21a61ea4cac32d5bc46c2abe66 Author: Jesús Sanz del Rey <jesussanz2003(a)gmail.com> AuthorDate: Tue Jan 11 00:20:23 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 11 00:20:23 2022 +0100 [SHELL32] Fix recycle bin handle reference leaking (#4222) CORE-13730 There was a handle reference leak in the recycler bin and the bin wasn't removing the copied file after restoring it. Close the handle were the memory leak was and move the file when restoring it. --- dll/win32/shell32/folders/CRecycleBin.cpp | 21 ++++++++++----------- dll/win32/shell32/shellrecyclebin/recyclebin_v5.c | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index dbf03672cee..cba7c52e42e 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -380,19 +380,18 @@ HRESULT WINAPI CRecycleBinItemContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO l if (!Context.bFound) return E_FAIL; - if (lpcmi->lpVerb == MAKEINTRESOURCEA(1)) - { - /* restore file */ - if (RestoreFile(Context.hDeletedFile)) - return S_OK; - else - return E_FAIL; - } + BOOL ret = TRUE; + + /* restore file */ + if (lpcmi->lpVerb == MAKEINTRESOURCEA(1)) + ret = RestoreFile(Context.hDeletedFile); + /* delete file */ else - { DeleteFileHandleToRecycleBin(Context.hDeletedFile); - return E_NOTIMPL; - } + + CloseRecycleBinHandle(Context.hDeletedFile); + + return (ret ? S_OK : E_FAIL); } else if (lpcmi->lpVerb == MAKEINTRESOURCEA(3)) { diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c index 766bf4f4631..5bbd9548997 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c @@ -3,7 +3,7 @@ * LICENSE: GPL v2 - See COPYING in the top level directory * FILE: lib/recyclebin/recyclebin_v5.c * PURPOSE: Deals with recycle bins of Windows 2000/XP/2003 - * PROGRAMMERS: Copyright 2006-2007 Herv� Poussineau (hpoussin(a)reactos.org) + * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) */ #include "recyclebin_private.h" @@ -500,7 +500,7 @@ RecycleBin5_RecycleBin5_Restore( { /* Restore file */ ZeroMemory(&op, sizeof(op)); - op.wFunc = FO_COPY; + op.wFunc = FO_MOVE; op.pFrom = pDeletedFileName; op.pTo = pDeletedFile->FileNameW;

1 0

[reactos] 01/01: [MSPAINT] Some minor improvements (#4264)
by Katayama Hirofumi MZ 10 Jan '22

10 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3456538e3a8ce41d5653f… commit 3456538e3a8ce41d5653fc6492e67964ee22776c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 10 21:44:13 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 10 21:44:13 2022 +0900 [MSPAINT] Some minor improvements (#4264) - Fix Japanese IDS_MINIATURETITLE resource string. - Fix Japanese IDM_VIEWSHOWMINIATURE menu item text. - Fix DWORD as COLORREF. - Improve some OnPaint's. CORE-17969 --- base/applications/mspaint/drawing.cpp | 2 +- base/applications/mspaint/drawing.h | 2 +- base/applications/mspaint/imgarea.cpp | 6 ++++-- base/applications/mspaint/lang/ja-JP.rc | 4 ++-- base/applications/mspaint/palette.cpp | 2 +- base/applications/mspaint/selection.cpp | 21 +++++++++++---------- base/applications/mspaint/selection.h | 1 - base/applications/mspaint/toolsettings.cpp | 2 +- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index d7453ff198a..059559252b9 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -246,7 +246,7 @@ RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2) } void -SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, DWORD system_selection_color) +SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF system_selection_color) { HBRUSH oldBrush; LOGBRUSH logbrush; diff --git a/base/applications/mspaint/drawing.h b/base/applications/mspaint/drawing.h index 737d035250a..017b71f6ddb 100644 --- a/base/applications/mspaint/drawing.h +++ b/base/applications/mspaint/drawing.h @@ -32,6 +32,6 @@ void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG sty void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); -void SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, DWORD system_selection_color); +void SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF system_selection_color); void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style); diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index 6c117591dc6..cfa9a84d8d3 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -143,8 +143,10 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b DeleteObject(SelectObject(hdc, oldPen)); } EndPaint(&ps); - selectionWindow.Invalidate(FALSE); - miniature.Invalidate(FALSE); + if (selectionWindow.IsWindowVisible()) + selectionWindow.Invalidate(FALSE); + if (miniature.IsWindowVisible()) + miniature.Invalidate(FALSE); if (textEditWindow.IsWindowVisible()) textEditWindow.Invalidate(FALSE); return 0; diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 02fa6324bd4..8da4c05a2a5 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -71,7 +71,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "グリッドを表示(&G)\tCtrl+G", IDM_VIEWSHOWGRID - MENUITEM "実寸表示(&H)", IDM_VIEWSHOWMINIATURE + MENUITEM "縮小表示(&H)", IDM_VIEWSHOWMINIATURE END MENUITEM "全画面表示(&F)\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -212,7 +212,7 @@ BEGIN IDS_INFOTEXT "GNU Lesser General Public License (LGPL, 詳細は www.gnu.org) の下で利用可能です。" IDS_SAVEPROMPTTEXT "%s の変更内容を保存しますか？" IDS_DEFAULTFILENAME "無題" - IDS_MINIATURETITLE "縮小図" + IDS_MINIATURETITLE "縮小表示" IDS_TOOLTIP1 "自由選択" IDS_TOOLTIP2 "選択" IDS_TOOLTIP3 "消しゴム" diff --git a/base/applications/mspaint/palette.cpp b/base/applications/mspaint/palette.cpp index c83dad82580..9667397a5bf 100644 --- a/base/applications/mspaint/palette.cpp +++ b/base/applications/mspaint/palette.cpp @@ -15,13 +15,13 @@ LRESULT CPaletteWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { RECT rc = { 0, 0, 31, 32 }; - HDC hDC = GetDC(); HPEN oldPen; HBRUSH oldBrush; int i, a, b; DefWindowProc(WM_PAINT, wParam, lParam); + HDC hDC = GetDC(); for(b = 2; b < 30; b++) for(a = 2; a < 29; a++) if ((a + b) % 2 == 1) diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index 90bcbde70bb..c2c32880f97 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -22,7 +22,9 @@ const LPCTSTR CSelectionWindow::m_lpszCursorLUT[9] = { /* action to mouse cursor }; BOOL -ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, DWORD dwRop, COLORREF keyColor) +ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, + HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, + DWORD dwRop, COLORREF keyColor) { HDC hTempDC; HDC hTempDC2; @@ -88,13 +90,14 @@ int CSelectionWindow::IdentifyCorner(int iXPos, int iYPos, int iWidth, int iHeig LRESULT CSelectionWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + DefWindowProc(WM_PAINT, wParam, lParam); if (!m_bMoving) { HDC hDC = GetDC(); - DefWindowProc(WM_PAINT, wParam, lParam); - SelectionFrame(hDC, 1, 1, Zoomed(selectionModel.GetDestRectWidth()) + 5, - Zoomed(selectionModel.GetDestRectHeight()) + 5, - m_dwSystemSelectionColor); + SelectionFrame(hDC, 1, 1, + Zoomed(selectionModel.GetDestRectWidth()) + (GRIP_SIZE * 2) - 1, + Zoomed(selectionModel.GetDestRectHeight()) + (GRIP_SIZE * 2) - 1, + GetSysColor(COLOR_HIGHLIGHT)); ReleaseDC(hDC); } return 0; @@ -103,7 +106,7 @@ LRESULT CSelectionWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& LRESULT CSelectionWindow::OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { // do nothing => transparent background - return 0; + return TRUE; } LRESULT CSelectionWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -111,16 +114,14 @@ LRESULT CSelectionWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL m_bMoving = FALSE; m_iAction = ACTION_MOVE; /* update the system selection color */ - m_dwSystemSelectionColor = GetSysColor(COLOR_HIGHLIGHT); - SendMessage(WM_PAINT, 0, MAKELPARAM(0, 0)); + Invalidate(); return 0; } LRESULT CSelectionWindow::OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* update the system selection color */ - m_dwSystemSelectionColor = GetSysColor(COLOR_HIGHLIGHT); - SendMessage(WM_PAINT, 0, MAKELPARAM(0, 0)); + Invalidate(); return 0; } diff --git a/base/applications/mspaint/selection.h b/base/applications/mspaint/selection.h index 4dcd5541bdb..82ba84a6016 100644 --- a/base/applications/mspaint/selection.h +++ b/base/applications/mspaint/selection.h @@ -55,7 +55,6 @@ private: POINT m_ptPos; POINT m_ptFrac; POINT m_ptDelta; - DWORD m_dwSystemSelectionColor; int IdentifyCorner(int iXPos, int iYPos, int iWidth, int iHeight); }; diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 4639d81da66..0c3d3e0bdf9 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -33,12 +33,12 @@ LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CToolSettingsWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - HDC hdc = GetDC(); RECT rect1 = { 0, 0, 42, 66 }; RECT rect2 = { 0, 70, 42, 136 }; DefWindowProc(WM_PAINT, wParam, lParam); + HDC hdc = GetDC(); DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (toolsModel.GetActiveTool() == TOOL_ZOOM) ? BF_RECT : BF_RECT | BF_MIDDLE); DrawEdge(hdc, &rect2, (toolsModel.GetActiveTool() >= TOOL_RECT) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE); switch (toolsModel.GetActiveTool())

1 0

[reactos] 01/01: [MSPAINT] Don't hide selection on zooming (#4266)
by Katayama Hirofumi MZ 10 Jan '22

10 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edf92c004d5d7e6994596… commit edf92c004d5d7e69945961266c156aa6445a6d8a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 10 21:41:00 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 10 21:41:00 2022 +0900 [MSPAINT] Don't hide selection on zooming (#4266) - Don't hide the selection window on zooming. - Move the selection window by calling placeSelWin() when zoomed. CORE-17969 --- base/applications/mspaint/selection.cpp | 6 ++++++ base/applications/mspaint/selection.h | 2 ++ base/applications/mspaint/toolsmodel.cpp | 2 ++ base/applications/mspaint/winproc.cpp | 1 - 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index 8edd85ba173..90bcbde70bb 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -285,3 +285,9 @@ LRESULT CSelectionWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, { return ::SendMessage(GetParent(), nMsg, wParam, lParam); } + +LRESULT CSelectionWindow::OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + placeSelWin(); + return 0; +} diff --git a/base/applications/mspaint/selection.h b/base/applications/mspaint/selection.h index 44c9bac0ade..4dcd5541bdb 100644 --- a/base/applications/mspaint/selection.h +++ b/base/applications/mspaint/selection.h @@ -26,6 +26,7 @@ public: MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) MESSAGE_HANDLER(WM_PALETTEMODELCOLORCHANGED, OnPaletteModelColorChanged) MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) + MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) MESSAGE_HANDLER(WM_SELECTIONMODELREFRESHNEEDED, OnSelectionModelRefreshNeeded) MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) @@ -42,6 +43,7 @@ public: LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSelectionModelRefreshNeeded(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index f5725207a1c..021df46d336 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -181,6 +181,8 @@ void ToolsModel::NotifyZoomChanged() toolSettingsWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); if (textEditWindow.IsWindow()) textEditWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); + if (selectionWindow.IsWindow()) + selectionWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); } void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 43b0f812c1f..a0af103f080 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -36,7 +36,6 @@ zoomTo(int newZoom, int mouseX, int mouseY) toolsModel.SetZoom(newZoom); - selectionWindow.ShowWindow(SW_HIDE); imageArea.MoveWindow(GRIP_SIZE, GRIP_SIZE, Zoomed(imageModel.GetWidth()), Zoomed(imageModel.GetHeight()), FALSE); scrollboxWindow.Invalidate(TRUE); imageArea.Invalidate(FALSE);

1 0

[reactos] 01/01: [SDK:DDK][NTOS:PNP] Implement PnP arbiters initialization
by Vadim Galyant 10 Jan '22

10 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fec440d8b88b334815dc9… commit fec440d8b88b334815dc9e84f6abc9c15947f66f Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Mon Jan 10 06:35:45 2022 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 10 06:35:45 2022 +0300 [SDK:DDK][NTOS:PNP] Implement PnP arbiters initialization --- ntoskrnl/io/pnpmgr/arbiters.c | 514 ++++++++++++++++++++++++++++++++++++++ ntoskrnl/io/pnpmgr/arbs.c | 123 --------- ntoskrnl/ntos.cmake | 2 +- sdk/lib/drivers/arbiter/arbiter.c | 386 +++++++++++++++++++++++++++- sdk/lib/drivers/arbiter/arbiter.h | 76 +++--- 5 files changed, 928 insertions(+), 173 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/arbiters.c b/ntoskrnl/io/pnpmgr/arbiters.c new file mode 100644 index 00000000000..9a299c08ac6 --- /dev/null +++ b/ntoskrnl/io/pnpmgr/arbiters.c @@ -0,0 +1,514 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Root arbiters of the PnP manager + * COPYRIGHT: Copyright 2020 Vadim Galyant <vgal(a)rambler.ru> + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> + +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +extern ARBITER_INSTANCE IopRootBusNumberArbiter; +extern ARBITER_INSTANCE IopRootIrqArbiter; +extern ARBITER_INSTANCE IopRootDmaArbiter; +extern ARBITER_INSTANCE IopRootMemArbiter; +extern ARBITER_INSTANCE IopRootPortArbiter; + +/* DATA **********************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +/* BusNumber arbiter */ + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopBusNumberUnpackRequirement( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, + _Out_ PUINT64 OutMinimumAddress, + _Out_ PUINT64 OutMaximumAddress, + _Out_ PUINT32 OutLength, + _Out_ PUINT32 OutAlignment) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopBusNumberPackResource( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, + _In_ UINT64 Start, + _Out_ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopBusNumberUnpackResource( + _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor, + _Out_ PUINT64 Start, + _Out_ PUINT32 Length) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +INT32 +NTAPI +IopBusNumberScoreRequirement( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return 0; +} + +#define ARB_MAX_BUS_NUMBER 0xFF + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopBusNumberInitialize(VOID) +{ + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("IopRootBusNumberArbiter %p\n", &IopRootBusNumberArbiter); + + IopRootBusNumberArbiter.UnpackRequirement = IopBusNumberUnpackRequirement; + IopRootBusNumberArbiter.PackResource = IopBusNumberPackResource; + IopRootBusNumberArbiter.UnpackResource = IopBusNumberUnpackResource; + IopRootBusNumberArbiter.ScoreRequirement = IopBusNumberScoreRequirement; + + Status = ArbInitializeArbiterInstance(&IopRootBusNumberArbiter, + NULL, + CmResourceTypeBusNumber, + L"RootBusNumber", + L"Root", + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopBusNumberInitialize: Status %p\n", Status); + ASSERT(FALSE); + return Status; + } + + Status = RtlAddRange(IopRootBusNumberArbiter.Allocation, + (UINT64)(ARB_MAX_BUS_NUMBER + 1), + (UINT64)(-1), + 0, + 0, + NULL, + NULL); + + return Status; +} + +/* Irq arbiter */ + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopIrqUnpackRequirement( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, + _Out_ PUINT64 OutMinimumVector, + _Out_ PUINT64 OutMaximumVector, + _Out_ PUINT32 OutParam1, + _Out_ PUINT32 OutParam2) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopIrqPackResource( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, + _In_ UINT64 Start, + _Out_ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopIrqUnpackResource( + _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor, + _Out_ PUINT64 Start, + _Out_ PUINT32 OutLength) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +INT32 +NTAPI +IopIrqScoreRequirement( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return 0; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopIrqTranslateOrdering( + _Out_ PIO_RESOURCE_DESCRIPTOR OutIoDescriptor, + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopIrqInitialize(VOID) +{ + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("IopRootIrqArbiter %p\n", &IopRootIrqArbiter); + + IopRootIrqArbiter.UnpackRequirement = IopIrqUnpackRequirement; + IopRootIrqArbiter.PackResource = IopIrqPackResource; + IopRootIrqArbiter.UnpackResource = IopIrqUnpackResource; + IopRootIrqArbiter.ScoreRequirement = IopIrqScoreRequirement; + + Status = ArbInitializeArbiterInstance(&IopRootIrqArbiter, + NULL, + CmResourceTypeInterrupt, + L"RootIRQ", + L"Root", + IopIrqTranslateOrdering); + return Status; +} + +/* Dma arbiter */ + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopDmaUnpackRequirement( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, + _Out_ PUINT64 OutMinimumChannel, + _Out_ PUINT64 OutMaximumChannel, + _Out_ PUINT32 OutParam1, + _Out_ PUINT32 OutParam2) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopDmaPackResource( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, + _In_ UINT64 Start, + _Out_ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopDmaUnpackResource( + _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor, + _Out_ PUINT64 Start, + _Out_ PUINT32 OutLength) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +INT32 +NTAPI +IopDmaScoreRequirement( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return 0; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopDmaOverrideConflict( + _In_ PARBITER_INSTANCE Arbiter) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopDmaInitialize(VOID) +{ + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("IopRootDmaArbiter %p\n", &IopRootDmaArbiter); + + IopRootDmaArbiter.UnpackRequirement = IopDmaUnpackRequirement; + IopRootDmaArbiter.PackResource = IopDmaPackResource; + IopRootDmaArbiter.UnpackResource = IopDmaUnpackResource; + IopRootDmaArbiter.ScoreRequirement = IopDmaScoreRequirement; + + IopRootDmaArbiter.OverrideConflict = IopDmaOverrideConflict; + + Status = ArbInitializeArbiterInstance(&IopRootDmaArbiter, + NULL, + CmResourceTypeDma, + L"RootDMA", + L"Root", + NULL); + return Status; +} + +/* Common for Memory and Port arbiters */ + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopGenericUnpackRequirement( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, + _Out_ PUINT64 OutMinimumAddress, + _Out_ PUINT64 OutMaximumAddress, + _Out_ PUINT32 OutLength, + _Out_ PUINT32 OutAlignment) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopGenericPackResource( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, + _In_ UINT64 Start, + _Out_ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopGenericUnpackResource( + _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor, + _Out_ PUINT64 Start, + _Out_ PUINT32 OutLength) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +INT32 +NTAPI +IopGenericScoreRequirement( + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return 0; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopGenericTranslateOrdering( + _Out_ PIO_RESOURCE_DESCRIPTOR OutIoDescriptor, + _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Memory arbiter */ + +CODE_SEG("PAGE") +BOOLEAN +NTAPI +IopMemFindSuitableRange( + _In_ PARBITER_INSTANCE Arbiter, + _In_ PARBITER_ALLOCATION_STATE State) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return FALSE; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopMemInitialize(VOID) +{ + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("IopRootMemArbiter %p\n", &IopRootMemArbiter); + + IopRootMemArbiter.UnpackRequirement = IopGenericUnpackRequirement; + IopRootMemArbiter.PackResource = IopGenericPackResource; + IopRootMemArbiter.UnpackResource = IopGenericUnpackResource; + IopRootMemArbiter.ScoreRequirement = IopGenericScoreRequirement; + + IopRootMemArbiter.FindSuitableRange = IopMemFindSuitableRange; + + Status = ArbInitializeArbiterInstance(&IopRootMemArbiter, + NULL, + CmResourceTypeMemory, + L"RootMemory", + L"Root", + IopGenericTranslateOrdering); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopMemInitialize: Status %p\n", Status); + ASSERT(FALSE); + return Status; + } + + Status = RtlAddRange(IopRootMemArbiter.Allocation, + 0, + (UINT64)(PAGE_SIZE - 1), + 0, + 0, + NULL, + NULL); + + return Status; +} + +/* Port arbiter */ + +CODE_SEG("PAGE") +BOOLEAN +NTAPI +IopPortFindSuitableRange( + _In_ PARBITER_INSTANCE Arbiter, + _In_ PARBITER_ALLOCATION_STATE State) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return FALSE; +} + +CODE_SEG("PAGE") +VOID +NTAPI +IopPortAddAllocation( + _In_ PARBITER_INSTANCE Arbiter, + _In_ PARBITER_ALLOCATION_STATE ArbState) +{ + PAGED_CODE(); + + UNIMPLEMENTED; +} + +CODE_SEG("PAGE") +VOID +NTAPI +IopPortBacktrackAllocation( + _In_ PARBITER_INSTANCE Arbiter, + _Inout_ PARBITER_ALLOCATION_STATE ArbState) +{ + PAGED_CODE(); + + UNIMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +IopPortInitialize(VOID) +{ + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("IopRootPortArbiter %p\n", &IopRootPortArbiter); + + IopRootPortArbiter.UnpackRequirement = IopGenericUnpackRequirement; + IopRootPortArbiter.PackResource = IopGenericPackResource; + IopRootPortArbiter.UnpackResource = IopGenericUnpackResource; + IopRootPortArbiter.ScoreRequirement = IopGenericScoreRequirement; + + IopRootPortArbiter.FindSuitableRange = IopPortFindSuitableRange; + IopRootPortArbiter.AddAllocation = IopPortAddAllocation; + IopRootPortArbiter.BacktrackAllocation = IopPortBacktrackAllocation; + + Status = ArbInitializeArbiterInstance(&IopRootPortArbiter, + NULL, + CmResourceTypePort, + L"RootPort", + L"Root", + IopGenericTranslateOrdering); + return Status; +} diff --git a/ntoskrnl/io/pnpmgr/arbs.c b/ntoskrnl/io/pnpmgr/arbs.c deleted file mode 100644 index 09bab2ad735..00000000000 --- a/ntoskrnl/io/pnpmgr/arbs.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: ntoskrnl/io/pnpmgr/arbs.c - * PURPOSE: Root arbiters of the PnP manager - * PROGRAMMERS: Copyright 2020 Vadim Galyant <vgal(a)rambler.ru> - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> - -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -extern ARBITER_INSTANCE IopRootBusNumberArbiter; -extern ARBITER_INSTANCE IopRootIrqArbiter; -extern ARBITER_INSTANCE IopRootDmaArbiter; -extern ARBITER_INSTANCE IopRootMemArbiter; -extern ARBITER_INSTANCE IopRootPortArbiter; - -/* DATA **********************************************************************/ - -/* FUNCTIONS *****************************************************************/ - -/* BusNumber arbiter */ - -NTSTATUS -NTAPI -IopBusNumberInitialize(VOID) -{ - NTSTATUS Status; - - DPRINT("IopRootBusNumberArbiter %p\n", &IopRootBusNumberArbiter); - - Status = ArbInitializeArbiterInstance(&IopRootBusNumberArbiter, - NULL, - CmResourceTypeBusNumber, - L"RootBusNumber", - L"Root", - NULL); - return Status; -} - -/* Irq arbiter */ - -NTSTATUS -NTAPI -IopIrqInitialize(VOID) -{ - NTSTATUS Status; - - DPRINT("IopRootIrqArbiter %p\n", &IopRootIrqArbiter); - - Status = ArbInitializeArbiterInstance(&IopRootIrqArbiter, - NULL, - CmResourceTypeInterrupt, - L"RootIRQ", - L"Root", - NULL); - return Status; -} - -/* Dma arbiter */ - -NTSTATUS -NTAPI -IopDmaInitialize(VOID) -{ - NTSTATUS Status; - - DPRINT("IopRootDmaArbiter %p\n", &IopRootDmaArbiter); - - Status = ArbInitializeArbiterInstance(&IopRootDmaArbiter, - NULL, - CmResourceTypeDma, - L"RootDMA", - L"Root", - NULL); - return Status; -} - -/* Memory arbiter */ - -NTSTATUS -NTAPI -IopMemInitialize(VOID) -{ - NTSTATUS Status; - - DPRINT("IopRootMemArbiter %p\n", &IopRootMemArbiter); - - Status = ArbInitializeArbiterInstance(&IopRootMemArbiter, - NULL, - CmResourceTypeMemory, - L"RootMemory", - L"Root", - NULL); - return Status; -} - -/* Port arbiter */ - -NTSTATUS -NTAPI -IopPortInitialize(VOID) -{ - NTSTATUS Status; - - DPRINT("IopRootPortArbiter %p\n", &IopRootPortArbiter); - - Status = ArbInitializeArbiterInstance(&IopRootPortArbiter, - NULL, - CmResourceTypePort, - L"RootPort", - L"Root", - NULL); - return Status; -} - -/* EOF */ diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index d4bfd5f08a3..89802e07c41 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -151,7 +151,7 @@ list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/symlink.c ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/util.c ${REACTOS_SOURCE_DIR}/ntoskrnl/io/iomgr/volume.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/arbs.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/arbiters.c ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/devaction.c ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/devnode.c ${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/plugplay.c diff --git a/sdk/lib/drivers/arbiter/arbiter.c b/sdk/lib/drivers/arbiter/arbiter.c index 9d7d5561de4..e4e1c719ac7 100644 --- a/sdk/lib/drivers/arbiter/arbiter.c +++ b/sdk/lib/drivers/arbiter/arbiter.c @@ -1,16 +1,14 @@ /* - * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: lib/drivers/arbiter/arbiter.c - * PURPOSE: Hardware Resources Arbiter Library - * PROGRAMMERS: Copyright 2020 Vadim Galyant <vgal(a)rambler.ru> + * PROJECT: ReactOS Kernel&Driver SDK + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hardware Resources Arbiter Library + * COPYRIGHT: Copyright 2020 Vadim Galyant <vgal(a)rambler.ru> */ /* INCLUDES *******************************************************************/ #include <ntifs.h> -#include <ndk/rtltypes.h> - +#include <ndk/rtlfuncs.h> #include "arbiter.h" #define NDEBUG @@ -22,6 +20,263 @@ /* FUNCTIONS ******************************************************************/ +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbTestAllocation( + _In_ PARBITER_INSTANCE Arbiter, + _In_ PLIST_ENTRY ArbitrationList) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbRetestAllocation( + _In_ PARBITER_INSTANCE Arbiter, + _In_ PLIST_ENTRY ArbitrationList) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbCommitAllocation( + _In_ PARBITER_INSTANCE Arbiter) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbRollbackAllocation( + _In_ PARBITER_INSTANCE Arbiter) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* FIXME: the prototype is not correct yet. */ +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbAddReserved( + _In_ PARBITER_INSTANCE Arbiter) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbPreprocessEntry( + _In_ PARBITER_INSTANCE Arbiter, + _Inout_ PARBITER_ALLOCATION_STATE ArbState) +{ + PAGED_CODE(); + + return STATUS_SUCCESS; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbAllocateEntry( + _In_ PARBITER_INSTANCE Arbiter, + _Inout_ PARBITER_ALLOCATION_STATE ArbState) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +BOOLEAN +NTAPI +ArbGetNextAllocationRange( + _In_ PARBITER_INSTANCE Arbiter, + _Inout_ PARBITER_ALLOCATION_STATE ArbState) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return FALSE; +} + +CODE_SEG("PAGE") +BOOLEAN +NTAPI +ArbFindSuitableRange( + _In_ PARBITER_INSTANCE Arbiter, + _Inout_ PARBITER_ALLOCATION_STATE ArbState) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return FALSE; +} + +CODE_SEG("PAGE") +VOID +NTAPI +ArbAddAllocation( + _In_ PARBITER_INSTANCE Arbiter, + _Inout_ PARBITER_ALLOCATION_STATE ArbState) +{ + PAGED_CODE(); + + UNIMPLEMENTED; +} + +CODE_SEG("PAGE") +VOID +NTAPI +ArbBacktrackAllocation( + _In_ PARBITER_INSTANCE Arbiter, + _Inout_ PARBITER_ALLOCATION_STATE ArbState) +{ + PAGED_CODE(); + + UNIMPLEMENTED; +} + +/* FIXME: the prototype is not correct yet. */ +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbOverrideConflict( + _In_ PARBITER_INSTANCE Arbiter) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbBootAllocation( + _In_ PARBITER_INSTANCE Arbiter, + _In_ PLIST_ENTRY ArbitrationList) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* FIXME: the prototype is not correct yet. */ +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbQueryConflict( + _In_ PARBITER_INSTANCE Arbiter) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* FIXME: the prototype is not correct yet. */ +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbStartArbiter( + _In_ PARBITER_INSTANCE Arbiter) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbAddOrdering( + _Out_ PARBITER_ORDERING_LIST OrderList, + _In_ UINT64 MinimumAddress, + _In_ UINT64 MaximumAddress) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbPruneOrdering( + _Out_ PARBITER_ORDERING_LIST OrderingList, + _In_ UINT64 MinimumAddress, + _In_ UINT64 MaximumAddress) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbInitializeOrderingList( + _Out_ PARBITER_ORDERING_LIST OrderList) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +CODE_SEG("PAGE") +VOID +NTAPI +ArbFreeOrderingList( + _Out_ PARBITER_ORDERING_LIST OrderList) +{ + PAGED_CODE(); + + UNIMPLEMENTED; +} + +CODE_SEG("PAGE") +NTSTATUS +NTAPI +ArbBuildAssignmentOrdering( + _Inout_ PARBITER_INSTANCE ArbInstance, + _In_ PCWSTR OrderName, + _In_ PCWSTR ReservedOrderName, + _In_ PARB_TRANSLATE_ORDERING TranslateOrderingFunction) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + +CODE_SEG("PAGE") NTSTATUS NTAPI ArbInitializeArbiterInstance( @@ -34,11 +289,118 @@ ArbInitializeArbiterInstance( { NTSTATUS Status; - DPRINT("ArbInitializeArbiterInstance: Initializing %S Arbiter\n", ArbiterName); - UNIMPLEMENTED; + PAGED_CODE(); + + DPRINT("ArbInitializeArbiterInstance: '%S'\n", ArbiterName); + + ASSERT(Arbiter->UnpackRequirement != NULL); + ASSERT(Arbiter->PackResource != NULL); + ASSERT(Arbiter->UnpackResource != NULL); + ASSERT(Arbiter->MutexEvent == NULL); + ASSERT(Arbiter->Allocation == NULL); + ASSERT(Arbiter->PossibleAllocation == NULL); + ASSERT(Arbiter->AllocationStack == NULL); + + Arbiter->Signature = ARBITER_SIGNATURE; + Arbiter->BusDeviceObject = BusDeviceObject; + + Arbiter->MutexEvent = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_ARBITER); + if (!Arbiter->MutexEvent) + { + DPRINT1("ArbInitializeArbiterInstance: STATUS_INSUFFICIENT_RESOURCES\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + KeInitializeEvent(Arbiter->MutexEvent, SynchronizationEvent, TRUE); + + Arbiter->AllocationStack = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_ARB_ALLOCATION); + if (!Arbiter->AllocationStack) + { + DPRINT1("ArbInitializeArbiterInstance: STATUS_INSUFFICIENT_RESOURCES\n"); + ExFreePoolWithTag(Arbiter->MutexEvent, TAG_ARBITER); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Arbiter->AllocationStackMaxSize = PAGE_SIZE; + + Arbiter->Allocation = ExAllocatePoolWithTag(PagedPool, sizeof(RTL_RANGE_LIST), TAG_ARB_RANGE); + if (!Arbiter->Allocation) + { + DPRINT1("ArbInitializeArbiterInstance: STATUS_INSUFFICIENT_RESOURCES\n"); + ExFreePoolWithTag(Arbiter->AllocationStack, TAG_ARB_ALLOCATION); + ExFreePoolWithTag(Arbiter->MutexEvent, TAG_ARBITER); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Arbiter->PossibleAllocation = ExAllocatePoolWithTag(PagedPool, sizeof(RTL_RANGE_LIST), TAG_ARB_RANGE); + if (!Arbiter->PossibleAllocation) + { + DPRINT1("ArbInitializeArbiterInstance: STATUS_INSUFFICIENT_RESOURCES\n"); + ExFreePoolWithTag(Arbiter->Allocation, TAG_ARB_RANGE); + ExFreePoolWithTag(Arbiter->AllocationStack, TAG_ARB_ALLOCATION); + ExFreePoolWithTag(Arbiter->MutexEvent, TAG_ARBITER); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlInitializeRangeList(Arbiter->Allocation); + RtlInitializeRangeList(Arbiter->PossibleAllocation); + + Arbiter->Name = ArbiterName; + Arbiter->ResourceType = ResourceType; + Arbiter->TransactionInProgress = FALSE; + + if (!Arbiter->TestAllocation) + Arbiter->TestAllocation = ArbTestAllocation; + + if (!Arbiter->RetestAllocation) + Arbiter->RetestAllocation = ArbRetestAllocation; + + if (!Arbiter->CommitAllocation) + Arbiter->CommitAllocation = ArbCommitAllocation; + + if (!Arbiter->RollbackAllocation) + Arbiter->RollbackAllocation = ArbRollbackAllocation; + + if (!Arbiter->AddReserved) + Arbiter->AddReserved = ArbAddReserved; + + if (!Arbiter->PreprocessEntry) + Arbiter->PreprocessEntry = ArbPreprocessEntry; + + if (!Arbiter->AllocateEntry) + Arbiter->AllocateEntry = ArbAllocateEntry; + + if (!Arbiter->GetNextAllocationRange) + Arbiter->GetNextAllocationRange = ArbGetNextAllocationRange; + + if (!Arbiter->FindSuitableRange) + Arbiter->FindSuitableRange = ArbFindSuitableRange; + + if (!Arbiter->AddAllocation) + Arbiter->AddAllocation = ArbAddAllocation; + + if (!Arbiter->BacktrackAllocation) + Arbiter->BacktrackAllocation = ArbBacktrackAllocation; + + if (!Arbiter->OverrideConflict) + Arbiter->OverrideConflict = ArbOverrideConflict; + + if (!Arbiter->BootAllocation) + Arbiter->BootAllocation = ArbBootAllocation; + + if (!Arbiter->QueryConflict) + Arbiter->QueryConflict = ArbQueryConflict; + + if (!Arbiter->StartArbiter) + Arbiter->StartArbiter = ArbStartArbiter; + + Status = ArbBuildAssignmentOrdering(Arbiter, OrderName, OrderName, TranslateOrderingFunction); + if (NT_SUCCESS(Status)) + { + return STATUS_SUCCESS; + } + + DPRINT1("ArbInitializeArbiterInstance: Status %X\n", Status); - Status = STATUS_SUCCESS; return Status; } - -/* EOF */ diff --git a/sdk/lib/drivers/arbiter/arbiter.h b/sdk/lib/drivers/arbiter/arbiter.h index 6b8be2fb207..98e81711671 100644 --- a/sdk/lib/drivers/arbiter/arbiter.h +++ b/sdk/lib/drivers/arbiter/arbiter.h @@ -1,50 +1,53 @@ /* - * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: lib/drivers/arbiter/arbiter.h - * PURPOSE: Hardware Resources Arbiter Library - * PROGRAMMERS: Copyright 2020 Vadim Galyant <vgal(a)rambler.ru> + * PROJECT: ReactOS Kernel&Driver SDK + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hardware Resources Arbiter Library + * COPYRIGHT: Copyright 2020 Vadim Galyant <vgal(a)rambler.ru> */ -#ifndef _ARBITER_H -#define _ARBITER_H +#pragma once + +#define ARBITER_SIGNATURE 'sbrA' +#define TAG_ARBITER 'MbrA' +#define TAG_ARB_ALLOCATION 'AbrA' +#define TAG_ARB_RANGE 'RbrA' typedef struct _ARBITER_ORDERING { - ULONGLONG Start; - ULONGLONG End; + UINT64 Start; + UINT64 End; } ARBITER_ORDERING, *PARBITER_ORDERING; typedef struct _ARBITER_ORDERING_LIST { - USHORT Count; - USHORT Maximum; + UINT16 Count; + UINT16 Maximum; PARBITER_ORDERING Orderings; } ARBITER_ORDERING_LIST, *PARBITER_ORDERING_LIST; typedef struct _ARBITER_ALTERNATIVE { - ULONGLONG Minimum; - ULONGLONG Maximum; - ULONG Length; - ULONG Alignment; - LONG Priority; - ULONG Flags; + UINT64 Minimum; + UINT64 Maximum; + UINT32 Length; + UINT32 Alignment; + INT32 Priority; + UINT32 Flags; PIO_RESOURCE_DESCRIPTOR Descriptor; - ULONG Reserved[3]; + UINT32 Reserved[3]; } ARBITER_ALTERNATIVE, *PARBITER_ALTERNATIVE; typedef struct _ARBITER_ALLOCATION_STATE { - ULONGLONG Start; - ULONGLONG End; - ULONGLONG CurrentMinimum; - ULONGLONG CurrentMaximum; + UINT64 Start; + UINT64 End; + UINT64 CurrentMinimum; + UINT64 CurrentMaximum; PARBITER_LIST_ENTRY Entry; PARBITER_ALTERNATIVE CurrentAlternative; - ULONG AlternativeCount; + UINT32 AlternativeCount; PARBITER_ALTERNATIVE Alternatives; - USHORT Flags; + UINT16 Flags; UCHAR RangeAttributes; UCHAR RangeAvailableAttributes; ULONG_PTR WorkSpace; @@ -55,27 +58,27 @@ typedef struct _ARBITER_INSTANCE *PARBITER_INSTANCE; typedef NTSTATUS (NTAPI * PARB_UNPACK_REQUIREMENT)( _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, - _Out_ PULONGLONG OutMinimumAddress, - _Out_ PULONGLONG OutMaximumAddress, - _Out_ PULONG OutLength, - _Out_ PULONG OutAlignment + _Out_ PUINT64 OutMinimumAddress, + _Out_ PUINT64 OutMaximumAddress, + _Out_ PUINT32 OutLength, + _Out_ PUINT32 OutAlignment ); typedef NTSTATUS (NTAPI * PARB_PACK_RESOURCE)( _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor, - _In_ ULONGLONG Start, + _In_ UINT64 Start, _Out_ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor ); typedef NTSTATUS (NTAPI * PARB_UNPACK_RESOURCE)( _In_ PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor, - _Out_ PULONGLONG Start, - _Out_ PULONG OutLength + _Out_ PUINT64 Start, + _Out_ PUINT32 OutLength ); -typedef LONG +typedef INT32 (NTAPI * PARB_SCORE_REQUIREMENT)( _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor ); @@ -176,7 +179,7 @@ typedef NTSTATUS typedef struct _ARBITER_INSTANCE { - ULONG Signature; + UINT32 Signature; PKEVENT MutexEvent; PCWSTR Name; CM_RESOURCE_TYPE ResourceType; @@ -184,9 +187,9 @@ typedef struct _ARBITER_INSTANCE PRTL_RANGE_LIST PossibleAllocation; ARBITER_ORDERING_LIST OrderingList; ARBITER_ORDERING_LIST ReservedList; - LONG ReferenceCount; + INT32 ReferenceCount; PARBITER_INTERFACE Interface; - ULONG AllocationStackMaxSize; + UINT32 AllocationStackMaxSize; PARBITER_ALLOCATION_STATE AllocationStack; PARB_UNPACK_REQUIREMENT UnpackRequirement; PARB_PACK_RESOURCE PackResource; @@ -221,6 +224,7 @@ typedef NTSTATUS _In_ PIO_RESOURCE_DESCRIPTOR IoDescriptor ); +CODE_SEG("PAGE") NTSTATUS NTAPI ArbInitializeArbiterInstance( @@ -231,5 +235,3 @@ ArbInitializeArbiterInstance( _In_ PCWSTR OrderName, _In_ PARB_TRANSLATE_ORDERING TranslateOrderingFunction ); - -#endif /* _ARBITER_H */

1 0

[reactos] 01/01: [MSPAINT] Prepare for debugging (#4257)
by Katayama Hirofumi MZ 09 Jan '22

09 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2f8d62cd1a116fb2cad2… commit b2f8d62cd1a116fb2cad2af889e9c6651e942e42 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 10 08:50:37 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 10 08:50:37 2022 +0900 [MSPAINT] Prepare for debugging (#4257) - Add #include <debug.h> and add link to ntdll.dll for debugging. - Add CopyDIBImage helper function. CORE-17969 --- base/applications/mspaint/CMakeLists.txt | 2 +- base/applications/mspaint/dib.h | 5 +++++ base/applications/mspaint/history.cpp | 15 +++++++++------ base/applications/mspaint/precomp.h | 3 +++ base/applications/mspaint/selectionmodel.cpp | 5 ++--- base/applications/mspaint/winproc.cpp | 4 ++-- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index fcf694a08ca..03c71c21359 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -32,6 +32,6 @@ add_executable(mspaint ${SOURCE} rsrc.rc) set_module_type(mspaint win32gui UNICODE) target_link_libraries(mspaint uuid cpprt atl_classes) set_target_cpp_properties(mspaint WITH_EXCEPTIONS) -add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi) +add_importlibs(mspaint hhctrl comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 rpcrt4 shlwapi ntdll) add_pch(mspaint precomp.h SOURCE) add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 6bbb56d9c6d..21c73a7dd13 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -11,6 +11,11 @@ HBITMAP CreateDIBWithProperties(int width, int height); HBITMAP CreateColorDIB(int width, int height, COLORREF rgb); +static inline HBITMAP CopyDIBImage(HBITMAP hbm, INT cx = 0, INT cy = 0) +{ + return (HBITMAP)CopyImage(hbm, IMAGE_BITMAP, cx, cy, LR_COPYRETURNORG | LR_CREATEDIBSECTION); +} + int GetDIBWidth(HBITMAP hbm); int GetDIBHeight(HBITMAP hbm); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 221dffc52d7..1a5cd8966a8 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -44,8 +44,9 @@ ImageModel::ImageModel() void ImageModel::CopyPrevious() { + DPRINT("%s: %d\n", __FUNCTION__, currInd); DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); - hBms[(currInd + 1) % HISTORYSIZE] = (HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); + hBms[(currInd + 1) % HISTORYSIZE] = CopyDIBImage(hBms[currInd]); currInd = (currInd + 1) % HISTORYSIZE; if (undoSteps < HISTORYSIZE - 1) undoSteps++; @@ -56,6 +57,7 @@ void ImageModel::CopyPrevious() void ImageModel::Undo() { + DPRINT("%s: %d\n", __FUNCTION__, undoSteps); if (undoSteps > 0) { int oldWidth = GetWidth(); @@ -74,6 +76,7 @@ void ImageModel::Undo() void ImageModel::Redo() { + DPRINT("%s: %d\n", __FUNCTION__, redoSteps); if (redoSteps > 0) { int oldWidth = GetWidth(); @@ -92,9 +95,9 @@ void ImageModel::Redo() void ImageModel::ResetToPrevious() { + DPRINT("%s: %d\n", __FUNCTION__, currInd); DeleteObject(hBms[currInd]); - hBms[currInd] = - (HBITMAP) CopyImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); + hBms[currInd] = CopyDIBImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE]); SelectObject(hDrawingDC, hBms[currInd]); NotifyImageChanged(); } @@ -183,9 +186,9 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk { int oldWidth = GetWidth(); int oldHeight = GetHeight(); - Insert((HBITMAP) CopyImage(hBms[currInd], IMAGE_BITMAP, - GetWidth() * nStretchPercentX / 100, - GetHeight() * nStretchPercentY / 100, 0)); + INT newWidth = oldWidth * nStretchPercentX / 100; + INT newHeight = oldHeight * nStretchPercentY / 100; + Insert(CopyDIBImage(hBms[currInd], newWidth, newHeight)); if (GetWidth() != oldWidth || GetHeight() != oldHeight) NotifyDimensionsChanged(); NotifyImageChanged(); diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 5e2756b2fa1..1f27501432f 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -21,6 +21,9 @@ #include <shellapi.h> #include <htmlhelp.h> +#define NDEBUG +#include <debug.h> + #define WM_TOOLSMODELTOOLCHANGED (WM_APP + 0) #define WM_TOOLSMODELSETTINGSCHANGED (WM_APP + 1) #define WM_TOOLSMODELZOOMCHANGED (WM_APP + 2) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 464b6bdca64..50c6ad4a53f 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -170,9 +170,8 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hBm) HDC hTempDC; HBITMAP hTempMask; - DeleteObject(SelectObject(m_hDC, m_hBm = (HBITMAP) CopyImage(hBm, - IMAGE_BITMAP, 0, 0, - LR_COPYRETURNORG))); + m_hBm = CopyDIBImage(hBm); + DeleteObject(SelectObject(m_hDC, m_hBm)); SetRectEmpty(&m_rcSrc); m_rcDest.left = m_rcDest.top = 0; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 7a739f76cca..43b0f812c1f 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -534,7 +534,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_EDITCOPY: OpenClipboard(); EmptyClipboard(); - SetClipboardData(CF_BITMAP, CopyImage(selectionModel.GetBitmap(), IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); + SetClipboardData(CF_BITMAP, CopyDIBImage(selectionModel.GetBitmap())); CloseClipboard(); break; case IDM_EDITCUT: @@ -653,7 +653,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH toolsModel.SetBackgroundTransparent(!toolsModel.IsBackgroundTransparent()); break; case IDM_IMAGECROP: - imageModel.Insert((HBITMAP) CopyImage(selectionModel.GetBitmap(), IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); + imageModel.Insert(CopyDIBImage(selectionModel.GetBitmap())); break; case IDM_VIEWTOOLBOX:

1 0

[reactos] 01/01: [SHELL32] Use the already existing g_pszShell32 instead of re-defining a new variable holding the very same string.
by Hermès Bélusca-Maïto 09 Jan '22

09 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48d1a7bf4dadb63c19153… commit 48d1a7bf4dadb63c191535769bc1f2cdddc39795 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 9 22:44:21 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 9 22:44:21 2022 +0100 [SHELL32] Use the already existing g_pszShell32 instead of re-defining a new variable holding the very same string. --- dll/win32/shell32/dialogs/dialogs.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 73de2f363ac..4b05a92ef31 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -164,8 +164,6 @@ DoLoadIcons(HWND hwndDlg, PPICK_ICON_CONTEXT pIconContext, LPCWSTR pszFile) return (pIconContext->nIcons > 0); } -static const LPCWSTR s_pszDefaultPath = L"%SystemRoot%\\system32\\shell32.dll"; - static void NoIconsInFile(HWND hwndDlg, PPICK_ICON_CONTEXT pIconContext) { // Show an error message @@ -174,7 +172,7 @@ static void NoIconsInFile(HWND hwndDlg, PPICK_ICON_CONTEXT pIconContext) MessageBoxW(hwndDlg, strText, strTitle, MB_ICONWARNING); // Load the default icons - DoLoadIcons(hwndDlg, pIconContext, s_pszDefaultPath); + DoLoadIcons(hwndDlg, pIconContext, g_pszShell32); } // Icon size @@ -388,7 +386,7 @@ BOOL WINAPI PickIconDlg( } // Set the default value - StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), s_pszDefaultPath); + StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), g_pszShell32); } // Show the dialog

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs