Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[dquintana] 65683: [SHELL32] * Use PrivateExtractIconsW instead of PrivateExtractIconExW to obtain the icons for caching. Fixes small shell icons using large icons scaled down instead of the proper...

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Dec 16 18:21:48 2014 New Revision: 65683 URL: http://svn.reactos.org/svn/reactos?rev=65683&view=rev Log: [SHELL32] * Use PrivateExtractIconsW instead of PrivateExtractIconExW to obtain the icons for caching. Fixes small shell icons using large icons scaled down instead of the proper 16px icons. Patch by Ismael Ferreras Morezuelas (swyter). CORE-8404 #resolve #comment Commited in r65683. Thanks. Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] Tue Dec 16 18:21:48 2014 @@ -392,23 +392,9 @@ HICON hiconLarge=0; HICON hiconSmall=0; UINT ret; - static UINT (WINAPI*PrivateExtractIconExW)(LPCWSTR,int,HICON*,HICON*,UINT) = NULL; - - if (!PrivateExtractIconExW) - { - HMODULE hUser32 = GetModuleHandleA("user32"); - PrivateExtractIconExW = (UINT(WINAPI*)(LPCWSTR,int,HICON*,HICON*,UINT)) GetProcAddress(hUser32, "PrivateExtractIconExW"); - } - - if (PrivateExtractIconExW) - { - PrivateExtractIconExW(sSourceFile, dwSourceIndex, &hiconLarge, &hiconSmall, 1); - } - else - { - PrivateExtractIconsW(sSourceFile, dwSourceIndex, 32, 32, &hiconLarge, NULL, 1, 0); - PrivateExtractIconsW(sSourceFile, dwSourceIndex, 16, 16, &hiconSmall, NULL, 1, 0); - } + + PrivateExtractIconsW(sSourceFile, dwSourceIndex, 32, 32, &hiconLarge, NULL, 1, LR_COPYFROMRESOURCE); + PrivateExtractIconsW(sSourceFile, dwSourceIndex, 16, 16, &hiconSmall, NULL, 1, LR_COPYFROMRESOURCE); if ( !hiconLarge || !hiconSmall) {

10 years

[hbelusca] 65682: [CSR] - Cleanup a bit csrmsg.h (by me), the ObjectDirectory member of the CSR_API_CONNECTINFO structure becomes unused starting Windows 2k3 (add an informative comment about that ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 15 23:35:32 2014 New Revision: 65682 URL: http://svn.reactos.org/svn/reactos?rev=65682&view=rev Log: [CSR] - Cleanup a bit csrmsg.h (by me), the ObjectDirectory member of the CSR_API_CONNECTINFO structure becomes unused starting Windows 2k3 (add an informative comment about that fact). - Remove now unneeded ObjectDirectory duplication code (by Timo). - Fix some whitespace. CORE-7505 #comment ObjectDirectory duplication code removed in r65682. Modified: trunk/reactos/include/reactos/subsys/csr/csrmsg.h trunk/reactos/subsystems/win32/csrsrv/api.c trunk/reactos/subsystems/win32/csrsrv/api.h trunk/reactos/subsystems/win32/csrsrv/status.h trunk/reactos/subsystems/win32/csrsrv/wait.c Modified: trunk/reactos/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Mon Dec 15 23:35:32 2014 @@ -46,18 +46,20 @@ typedef struct _CSR_API_CONNECTINFO { - HANDLE ObjectDirectory; - PVOID SharedSectionBase; - PVOID SharedStaticServerData; - PVOID SharedSectionHeap; - ULONG DebugFlags; - ULONG SizeOfPebData; - ULONG SizeOfTebData; - ULONG NumberOfServerDllNames; + HANDLE ObjectDirectory; // Unused on Windows >= 2k3 + PVOID SharedSectionBase; + PVOID SharedStaticServerData; + PVOID SharedSectionHeap; + ULONG DebugFlags; + ULONG SizeOfPebData; + ULONG SizeOfTebData; + ULONG NumberOfServerDllNames; HANDLE ServerProcessId; } CSR_API_CONNECTINFO, *PCSR_API_CONNECTINFO; -#define CSRSRV_VERSION 0x10000 +#if defined(_M_IX86) +C_ASSERT(sizeof(CSR_API_CONNECTINFO) == 0x24); +#endif // We must have a size at most equal to the maximum acceptable LPC data size. C_ASSERT(sizeof(CSR_API_CONNECTINFO) <= LPC_MAX_DATA_LENGTH); Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Mon Dec 15 23:35:32 2014 @@ -3,7 +3,7 @@ * PROJECT: ReactOS Client/Server Runtime SubSystem * FILE: subsystems/win32/csrsrv/api.c * PURPOSE: CSR Server DLL API LPC Implementation - * "\windows\ApiPort" port process management functions + * "\Windows\ApiPort" port process management functions * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ @@ -156,52 +156,28 @@ /* Check if we have a thread */ if (CsrThread) { - /* Get the Process */ + /* Get the Process and make sure we have it as well */ CsrProcess = CsrThread->Process; - - /* Make sure we have a Process as well */ if (CsrProcess) { /* Reference the Process */ CsrLockedReferenceProcess(CsrProcess); - /* Release the lock */ - CsrReleaseProcessLock(); - - /* Duplicate the Object Directory */ - Status = NtDuplicateObject(NtCurrentProcess(), - CsrObjectDirectory, - CsrProcess->ProcessHandle, - &ConnectInfo->ObjectDirectory, - 0, - 0, - DUPLICATE_SAME_ACCESS | - DUPLICATE_SAME_ATTRIBUTES); - - /* Acquire the lock */ - CsrAcquireProcessLock(); - - /* Check for success */ + /* Attach the Shared Section */ + Status = CsrSrvAttachSharedSection(CsrProcess, ConnectInfo); if (NT_SUCCESS(Status)) { - /* Attach the Shared Section */ - Status = CsrSrvAttachSharedSection(CsrProcess, ConnectInfo); - - /* Check how this went */ - if (NT_SUCCESS(Status)) - { - /* Allow the connection, and return debugging flag */ - ConnectInfo->DebugFlags = CsrDebug; - AllowConnection = TRUE; - } - } - - /* Dereference the project */ + /* Allow the connection and return debugging flag */ + ConnectInfo->DebugFlags = CsrDebug; + AllowConnection = TRUE; + } + + /* Dereference the Process */ CsrLockedDereferenceProcess(CsrProcess); } } - /* Release the lock */ + /* Release the Process Lock */ CsrReleaseProcessLock(); /* Setup the Port View Structure */ @@ -1067,7 +1043,7 @@ { Connected = FALSE; } _SEH2_END; - + if (!Connected) { DPRINT1("CSRSS: CsrConnectToUser failed\n"); Modified: trunk/reactos/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] Mon Dec 15 23:35:32 2014 @@ -191,7 +191,7 @@ IN PVOID WaitArgument2, IN ULONG WaitFlags, IN BOOLEAN DereferenceThread); - + VOID NTAPI CsrReferenceNtSession(IN PCSR_NT_SESSION Session); Modified: trunk/reactos/subsystems/win32/csrsrv/status.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/st… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/status.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/status.h [iso-8859-1] Mon Dec 15 23:35:32 2014 @@ -1,5 +1,5 @@ /* - * CSRSRV Status + * CSRSRV Status */ /* Organization @@ -14,7 +14,7 @@ * up the DosDevices Object Directory, and initializing each component. * * procsup.c - Handles all internal functions dealing with the CSR Process Object, - * including de/allocation, de/referencing, un/locking, prority, and + * including de/allocation, de/referencing, un/locking, prority, and * lookups. Also handles all external APIs which touch the CSR Process Object. * * server.c - Handles all internal functions related to loading and managing Server Modified: trunk/reactos/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/wa… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] Mon Dec 15 23:35:32 2014 @@ -419,7 +419,7 @@ WaitArgument2, 0, FALSE); - + /* * We've already done a wait, so leave unless * we want to notify all the waits...

10 years

[hbelusca] 65681: [BASESRV] - Whitespace fixes. - Stub AppCompat module. Patch by Timo Kreuzer. CORE-7505 #comment AppCompat committed in r65681.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 15 22:48:38 2014 New Revision: 65681 URL: http://svn.reactos.org/svn/reactos?rev=65681&view=rev Log: [BASESRV] - Whitespace fixes. - Stub AppCompat module. Patch by Timo Kreuzer. CORE-7505 #comment AppCompat committed in r65681. Added: trunk/reactos/subsystems/win/basesrv/appcompat.c (with props) Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt trunk/reactos/subsystems/win/basesrv/api.h trunk/reactos/subsystems/win/basesrv/basesrv.h trunk/reactos/subsystems/win/basesrv/nls.c trunk/reactos/subsystems/win/basesrv/sndsntry.c trunk/reactos/subsystems/win/basesrv/vdm.c Modified: trunk/reactos/subsystems/win/basesrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/CMa… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/CMakeLists.txt [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -1,8 +1,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + spec2def(basesrv.dll basesrv.spec) list(APPEND SOURCE + appcompat.c dosdev.c init.c proc.c Modified: trunk/reactos/subsystems/win/basesrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/api… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/api.h [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -7,6 +7,9 @@ */ #pragma once + +/* appcompat.c */ +CSR_API(BaseSrvCheckApplicationCompatibility); /* dosdev.c */ VOID BaseInitDefineDosDevice(VOID); Added: trunk/reactos/subsystems/win/basesrv/appcompat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/app… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/appcompat.c (added) +++ trunk/reactos/subsystems/win/basesrv/appcompat.c [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -0,0 +1,67 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Base API Server DLL + * FILE: subsystems/win/basesrv/init.c + * PURPOSE: Initialization + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "basesrv.h" +#include "api.h" + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +typedef struct _BASE_APP_COMPAT_EXTRA1 +{ + WCHAR String1[32]; + ULONG tdwFlags; + ULONG SizeOfStruct; + ULONG tdwMagic; + ULONG ttrExe; + ULONG dword50; + ULONG dword54; + ULONG dword58; + PVOID ttrLayer; + CHAR String2[28]; + ULONG dword7C; + ULONG dword80; + ULONG field_84; + CHAR String3[256]; +} BASE_APP_COMPAT_EXTRA1, *PBASE_APP_COMPAT_EXTRA1; + +typedef struct _BASE_APP_COMPAT_DATA +{ + UNICODE_STRING FileName; + HANDLE ProcessHandle; + ULONG Flags; + USHORT Code; + USHORT Unknown_012; + PVOID Environment; + ULONG EnvironmentSize; + PBASE_APP_COMPAT_EXTRA1 AppCompExtra1; + ULONG AppCompExtra1Size; + PVOID AppCompExtra2; + ULONG AppCompExtra2Size; + BOOL CheckRunAppResult; + ULONG Flags2; +} BASE_APP_COMPAT_DATA, *PBASE_APP_COMPAT_DATA; + +/* PUBLIC SERVER APIS *********************************************************/ + +CSR_API(BaseSrvCheckApplicationCompatibility) +{ + PBASE_APP_COMPAT_DATA AppCompatData = (PBASE_APP_COMPAT_DATA)&ApiMessage->Data; + DPRINT1("BASESRV: BaseSrvCheckApplicationCompatibility(%wZ)\n", + AppCompatData->FileName); + + AppCompatData->CheckRunAppResult = FALSE; + + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/win/basesrv/appcompat.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/basesrv.h [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -36,29 +36,29 @@ typedef struct _BASESRV_KERNEL_IMPORTS { - PCHAR FunctionName; + PCHAR FunctionName; PVOID* FunctionPointer; } BASESRV_KERNEL_IMPORTS, *PBASESRV_KERNEL_IMPORTS; /* FIXME: BASENLS.H */ -typedef NTSTATUS(WINAPI *POPEN_DATA_FILE)(HANDLE hFile, - PWCHAR FileName); +typedef NTSTATUS (WINAPI *POPEN_DATA_FILE)(HANDLE hFile, + PWCHAR FileName); -typedef BOOL(WINAPI *PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, - LPWSTR FileName, - ULONG FileNameSize); +typedef BOOL (WINAPI *PGET_CP_FILE_NAME_FROM_REGISTRY)(UINT CodePage, + LPWSTR FileName, + ULONG FileNameSize); -typedef BOOL(WINAPI *PGET_NLS_SECTION_NAME)(UINT CodePage, - UINT Base, - ULONG Unknown, - LPWSTR BaseName, - LPWSTR Result, - ULONG ResultSize); +typedef BOOL (WINAPI *PGET_NLS_SECTION_NAME)(UINT CodePage, + UINT Base, + ULONG Unknown, + LPWSTR BaseName, + LPWSTR Result, + ULONG ResultSize); -typedef BOOL(WINAPI *PVALIDATE_LOCALE)(IN ULONG LocaleId); -typedef NTSTATUS(WINAPI *PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, - IN ULONG BufferSize, - IN ULONG AceType); +typedef BOOL (WINAPI *PVALIDATE_LOCALE)(IN ULONG LocaleId); +typedef NTSTATUS (WINAPI *PCREATE_NLS_SECURTY_DESCRIPTOR)(IN PVOID Buffer, + IN ULONG BufferSize, + IN ULONG AceType); /* Globals */ extern HANDLE BaseSrvHeap; Modified: trunk/reactos/subsystems/win/basesrv/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/nls… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/nls.c [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -51,7 +51,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS +NTSTATUS NTAPI BaseSrvDelayLoadKernel32(VOID) { Modified: trunk/reactos/subsystems/win/basesrv/sndsntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/snd… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/sndsntry.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/sndsntry.c [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -50,7 +50,7 @@ 0, (PVOID*)&NewSoundSentry); } - + /* Set it as the callback for the future, and call it */ _UserSoundSentry = NewSoundSentry; return _UserSoundSentry(); Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Mon Dec 15 22:48:38 2014 @@ -364,7 +364,7 @@ RtlMoveMemory(&CommandInfo->StartupInfo, CheckVdmRequest->StartupInfo, sizeof(STARTUPINFOA)); - + /* Allocate memory for the desktop */ if (CheckVdmRequest->DesktopLen != 0) { @@ -1000,7 +1000,7 @@ DosRecord->ExitCode = GetNextVdmCommandRequest->ExitCode; /* Update the VDM state */ - DosRecord->State = VDM_READY; + DosRecord->State = VDM_READY; /* Notify all waiting threads that the task is finished */ NtSetEvent(DosRecord->ServerEvent, NULL);

10 years

[pschweitzer] 65680: [NTFS] Return the MFT index in FileFullDirectoryInformation and NtfsGetBothDirectoryInformation queries

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Dec 15 21:44:52 2014 New Revision: 65680 URL: http://svn.reactos.org/svn/reactos?rev=65680&view=rev Log: [NTFS] Return the MFT index in FileFullDirectoryInformation and NtfsGetBothDirectoryInformation queries Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Mon Dec 15 21:44:52 2014 @@ -198,6 +198,7 @@ NtfsGetFullDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, PNTFS_ATTR_CONTEXT DataContext, + ULONGLONG MFTIndex, PFILE_FULL_DIRECTORY_INFORMATION Info, ULONG BufferLength) { @@ -229,7 +230,7 @@ Info->EndOfFile.QuadPart = FileName->AllocatedSize; Info->AllocationSize.QuadPart = ROUND_UP(FileName->AllocatedSize, DeviceExt->NtfsInfo.BytesPerCluster); -// Info->FileIndex=; + Info->FileIndex = MFTIndex; Info->EaSize = 0; return STATUS_SUCCESS; @@ -240,6 +241,7 @@ NtfsGetBothDirectoryInformation(PDEVICE_EXTENSION DeviceExt, PFILE_RECORD_HEADER FileRecord, PNTFS_ATTR_CONTEXT DataContext, + ULONGLONG MFTIndex, PFILE_BOTH_DIR_INFORMATION Info, ULONG BufferLength) { @@ -285,7 +287,7 @@ Info->EndOfFile.QuadPart = FileName->AllocatedSize; Info->AllocationSize.QuadPart = ROUND_UP(FileName->AllocatedSize, DeviceExt->NtfsInfo.BytesPerCluster); -// Info->FileIndex=; + Info->FileIndex = MFTIndex; Info->EaSize = 0; return STATUS_SUCCESS; @@ -437,6 +439,7 @@ Status = NtfsGetFullDirectoryInformation(DeviceExtension, FileRecord, DataContext, + MFTRecord, (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, BufferLength); break; @@ -445,6 +448,7 @@ Status = NtfsGetBothDirectoryInformation(DeviceExtension, FileRecord, DataContext, + MFTRecord, (PFILE_BOTH_DIR_INFORMATION)Buffer, BufferLength); break;

10 years

[pschweitzer] 65679: [NTFS] - Store the link count in FCB and return it in FileStandardInformation query - Return the MFT index in NtfsGetInternalInformation query

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Dec 15 21:28:06 2014 New Revision: 65679 URL: http://svn.reactos.org/svn/reactos?rev=65679&view=rev Log: [NTFS] - Store the link count in FCB and return it in FileStandardInformation query - Return the MFT index in NtfsGetInternalInformation query Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/finfo.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Mon Dec 15 21:28:06 2014 @@ -358,6 +358,7 @@ Fcb->RFCB.ValidDataLength.QuadPart = FileName->DataSize; Fcb->RFCB.AllocationSize.QuadPart = FileName->AllocatedSize; Fcb->MFTIndex = NTFS_FILE_ROOT; + Fcb->LinkCount = MftRecord->LinkCount; NtfsFCBInitializeCache(Vcb, Fcb); NtfsAddFCBToTable(Vcb, Fcb); @@ -485,6 +486,7 @@ NtfsFCBInitializeCache(Vcb, rcFCB); rcFCB->RefCount = 1; rcFCB->MFTIndex = MFTIndex; + rcFCB->LinkCount = Record->LinkCount; NtfsAddFCBToTable(Vcb, rcFCB); *fileFCB = rcFCB; Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Mon Dec 15 21:28:06 2014 @@ -59,7 +59,7 @@ StandardInfo->AllocationSize = Fcb->RFCB.AllocationSize; StandardInfo->EndOfFile = Fcb->RFCB.FileSize; - StandardInfo->NumberOfLinks = 0; /* FIXME */ + StandardInfo->NumberOfLinks = Fcb->LinkCount; StandardInfo->DeletePending = FALSE; StandardInfo->Directory = NtfsFCBIsDirectory(Fcb); @@ -183,8 +183,7 @@ if (*BufferLength < sizeof(FILE_INTERNAL_INFORMATION)) return STATUS_BUFFER_OVERFLOW; - /* FIXME: get a real index, that can be used in a create operation */ - InternalInfo->IndexNumber.QuadPart = 0; + InternalInfo->IndexNumber.QuadPart = Fcb->MFTIndex; *BufferLength -= sizeof(FILE_INTERNAL_INFORMATION); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Dec 15 21:28:06 2014 @@ -444,6 +444,7 @@ ULONG Flags; ULONGLONG MFTIndex; + USHORT LinkCount; FILENAME_ATTRIBUTE Entry;

10 years

[hbelusca] 65678: [MSGINA]: Update the function names of stubs, with (in comments) the number of parameters they take. See CORE-8459 for more information. CORE-8459 #resolve #comment Fixed in r65678.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 15 21:07:23 2014 New Revision: 65678 URL: http://svn.reactos.org/svn/reactos?rev=65678&view=rev Log: [MSGINA]: Update the function names of stubs, with (in comments) the number of parameters they take. See CORE-8459 for more information. CORE-8459 #resolve #comment Fixed in r65678. Modified: trunk/reactos/dll/win32/msgina/msgina.spec Modified: trunk/reactos/dll/win32/msgina/msgina.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.sp… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] Mon Dec 15 21:07:23 2014 @@ -1,31 +1,31 @@ -1 stub -noname stub1 -2 stub -noname stub2 -3 stub -noname stub3 -4 stub -noname stub4 -5 stub -noname stub5 -6 stub -noname stub6 -7 stub -noname stub7 -8 stub -noname stub8 -9 stub -noname stub9 -10 stub -noname stub10 -11 stub -noname stub11 -12 stub -noname stub12 -13 stub -noname stub13 -14 stub -noname stub14 -15 stub -noname stub15 -16 stub -noname stub16 -17 stub -noname stub17 -18 stub -noname stub18 -19 stub -noname stub19 -20 stub -noname stub20 -21 stub -noname stub21 -22 stub -noname stub22 -23 stub -noname stub23 -24 stub -noname stub24 -25 stub -noname stub25 -26 stub -noname stub26 -27 stub -noname stub27 -28 stub -noname stub28 +1 stub -noname ShellGetUserList ; (long long long) +2 stub -noname ShellStatusHostEnd ; (long) +3 stub -noname ShellIsFriendlyUIActive ; () +4 stub -noname ShellIsSuspendAllowed ; () +5 stub -noname ShellIsRemoteConnectionsEnabled ; () +6 stub -noname ShellEnableFriendlyUI ; (long) +7 stub -noname ShellEnableMultipleUsers ; (long) +8 stub -noname ShellEnableRemoteConnections ; (long) +9 stub -noname ShellTurnOffDialog ; (long) +10 stub -noname ShellIsMultipleUsersEnabled ; () +11 stub -noname ShellACPIPowerButtonPressed ; (long long long) +12 stub -noname ShellIsSingleUserNoPassword ; (wstr wstr) +13 stub -noname ShellStatusHostShuttingDown ; () +14 stub -noname ShellNotifyThemeUserChange ; (long long) +15 stub -noname ShellSwitchWhenInteractiveReady ; (long long) +16 stub -noname ShellDimScreen ; (ptr ptr) +17 stub -noname ShellInstallAccountFilterData ; () +18 stub -noname ShellStatusHostBegin ; (long) +19 stub -noname ShellIsUserInteractiveLogonAllowed ; (long) +20 stub -noname ShellSwitchUser ; (long) +21 stub -noname ShellReturnToWelcome ; (long) +22 stub -noname ShellStatusHostPowerEvent ; () +23 stub -noname ShellStartCredentialServer ; (wstr long long long) +24 stub -noname ShellAcquireLogonMutex ; () +25 stub -noname ShellReleaseLogonMutex ; (long) +26 stub -noname ShellSignalShutdown ; () +27 stub -noname ShellStatusHostHide ; () +28 stub -noname ShellStatusHostShow ; () @ stdcall ShellShutdownDialog(ptr wstr long) @ stdcall WlxActivateUserShell(ptr wstr wstr ptr) @ stdcall WlxDisconnectNotify(ptr) @@ -42,7 +42,7 @@ @ stdcall WlxLogoff(ptr) @ stdcall WlxNegotiate(long ptr) @ stdcall WlxNetworkProviderLoad(ptr ptr) -@ stub WlxReconnectNotify +@ stub WlxReconnectNotify ; (long) @ stdcall WlxRemoveStatusMessage(ptr) @ stdcall WlxScreenSaverNotify(ptr ptr) @ stdcall WlxShutdown(ptr long)

10 years

[hbelusca] 65677: [TASKMGR]: Disable the "End task" button if no item is selected. Part 2 of a patch by Edijs. CORE-5655 #comment Patch committed. When one of you will have a patch for the Windows-...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 15 20:45:38 2014 New Revision: 65677 URL: http://svn.reactos.org/svn/reactos?rev=65677&view=rev Log: [TASKMGR]: Disable the "End task" button if no item is selected. Part 2 of a patch by Edijs. CORE-5655 #comment Patch committed. When one of you will have a patch for the Windows-menu items disabled bug, please reopen the report. #resolve Modified: trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Mon Dec 15 20:45:38 2014 @@ -41,6 +41,8 @@ static BOOL bSortAscending = TRUE; DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter); BOOL noApps; +BOOL bApplicationPageSelectionMade = FALSE; + BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam); void AddOrUpdateHwnd(HWND hWnd, WCHAR *szTitle, HICON hIcon, BOOL bHung); void ApplicationPageUpdate(void); @@ -138,6 +140,10 @@ #ifdef RUN_APPS_PAGE hApplicationThread = CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, &dwApplicationThread); #endif + + /* Refresh page */ + ApplicationPageUpdate(); + return TRUE; case WM_DESTROY: @@ -272,7 +278,10 @@ noApps = TRUE; EnumWindows(EnumWindowsProc, 0); if (noApps) + { (void)ListView_DeleteAllItems(hApplicationPageListCtrl); + bApplicationPageSelectionMade = FALSE; + } /* Get the image lists */ hImageListLarge = ListView_GetImageList(hApplicationPageListCtrl, LVSIL_NORMAL); @@ -457,7 +466,20 @@ item.lParam = (LPARAM)pAPLI; (void)ListView_InsertItem(hApplicationPageListCtrl, &item); } - return; + + /* Select first item if any */ + if ((ListView_GetNextItem(hApplicationPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) && + (ListView_GetItemCount(hApplicationPageListCtrl) > 0) && !bApplicationPageSelectionMade) + { + ListView_SetItemState(hApplicationPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); + bApplicationPageSelectionMade = TRUE; + } + /* + else + { + bApplicationPageSelectionMade = FALSE; + } + */ } void ApplicationPageUpdate(void) Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Mon Dec 15 20:45:38 2014 @@ -158,7 +158,7 @@ hProcessThread = CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, &dwProcessThread); #endif - /* Refresh controls */ + /* Refresh page */ ProcessPageUpdate(); return TRUE; @@ -433,6 +433,8 @@ wsprintfW(text, szProcesses, OldProcessCount); SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); } + + ProcessPageUpdate(); } } return 0; @@ -480,7 +482,7 @@ SendMessage(hProcessPageListCtrl, WM_SETREDRAW, TRUE, 0); /* Select first item if any */ - if ((ListView_GetNextItem(hProcessPageListCtrl, -1, LVNI_SELECTED | LVNI_FOCUSED) == -1) && + if ((ListView_GetNextItem(hProcessPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) && (ListView_GetItemCount(hProcessPageListCtrl) > 0) && !bProcessPageSelectionMade) { ListView_SetItemState(hProcessPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);

10 years

[hbelusca] 65676: [TASKMGR]: Disable the "End process" button if no item is selected. Part 1 of a patch by Edijs. CORE-5655 #comment procpage.c fix committed.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 15 20:33:26 2014 New Revision: 65676 URL: http://svn.reactos.org/svn/reactos?rev=65676&view=rev Log: [TASKMGR]: Disable the "End process" button if no item is selected. Part 1 of a patch by Edijs. CORE-5655 #comment procpage.c fix committed. Modified: trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Mon Dec 15 20:33:26 2014 @@ -33,12 +33,13 @@ ULONG ProcessId; } PROCESS_PAGE_LIST_ITEM, *LPPROCESS_PAGE_LIST_ITEM; -HWND hProcessPage; /* Process List Property Page */ - -HWND hProcessPageListCtrl; /* Process ListCtrl Window */ +HWND hProcessPage; /* Process List Property Page */ + +HWND hProcessPageListCtrl; /* Process ListCtrl Window */ HWND hProcessPageHeaderCtrl; /* Process Header Control */ -HWND hProcessPageEndProcessButton; /* Process End Process button */ +HWND hProcessPageEndProcessButton; /* Process End Process button */ HWND hProcessPageShowAllProcessesButton;/* Process Show All Processes checkbox */ +BOOL bProcessPageSelectionMade = FALSE; /* Is item in ListCtrl selected */ static int nProcessPageWidth; static int nProcessPageHeight; @@ -102,6 +103,15 @@ return 0; } +void ProcessPageUpdate(void) +{ + /* Enable or disable the "End Process" button */ + if (ListView_GetSelectedCount(hProcessPageListCtrl)) + EnableWindow(hProcessPageEndProcessButton, TRUE); + else + EnableWindow(hProcessPageEndProcessButton, FALSE); +} + INT_PTR CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -147,6 +157,10 @@ /* Start our refresh thread */ hProcessThread = CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, &dwProcessThread); #endif + + /* Refresh controls */ + ProcessPageUpdate(); + return TRUE; case WM_DESTROY: @@ -230,11 +244,9 @@ { switch (pnmh->code) { - #if 0 case LVN_ITEMCHANGED: ProcessPageUpdate(); break; - #endif case LVN_GETDISPINFO: @@ -466,6 +478,20 @@ } SendMessage(hProcessPageListCtrl, WM_SETREDRAW, TRUE, 0); + + /* Select first item if any */ + if ((ListView_GetNextItem(hProcessPageListCtrl, -1, LVNI_SELECTED | LVNI_FOCUSED) == -1) && + (ListView_GetItemCount(hProcessPageListCtrl) > 0) && !bProcessPageSelectionMade) + { + ListView_SetItemState(hProcessPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); + bProcessPageSelectionMade = TRUE; + } + /* + else + { + bProcessPageSelectionMade = FALSE; + } + */ } BOOL ProcessRunning(ULONG ProcessId)

10 years

[hbelusca] 65675: [TREE] - Use #pragma once in resource.h - put windows.h after CRT includes. - Convert the main .rc back to ANSI otherwise rc.exe complains, see http://stackoverflow.com/questions/...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 15 20:17:17 2014 New Revision: 65675 URL: http://svn.reactos.org/svn/reactos?rev=65675&view=rev Log: [TREE] - Use #pragma once in resource.h - put windows.h after CRT includes. - Convert the main .rc back to ANSI otherwise rc.exe complains, see http://stackoverflow.com/questions/15244065/error-rc2135-in-c-project-due-t… for more details. Modified: trunk/reactos/base/applications/cmdutils/tree/resource.h trunk/reactos/base/applications/cmdutils/tree/tree.c trunk/reactos/base/applications/cmdutils/tree/tree.rc Modified: trunk/reactos/base/applications/cmdutils/tree/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/resource.h [iso-8859-1] Mon Dec 15 20:17:17 2014 @@ -1,9 +1,6 @@ -#ifndef RESOURCE_H -#define RESOURCE_H +#pragma once #define IDS_USAGE 0 #define IDS_NO_SUBDIRECTORIES 1 #define IDS_FOLDER_PATH 2 #define IDS_VOL_SERIAL 3 - -#endif /* RESOURCE_H */ Modified: trunk/reactos/base/applications/cmdutils/tree/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] Mon Dec 15 20:17:17 2014 @@ -5,11 +5,9 @@ * PROGRAMMERS: Asif Bahrainwala (asif_bahrainwala(a)hotmail.com) */ -// Tree.cpp : Defines the entry point for the console application. -// -#include <windows.h> #include <stdio.h> //#include <stdarg.h> +#include <windows.h> #include "resource.h" Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Mon Dec 15 20:17:17 2014 @@ -1,4 +1,4 @@ -ï»¿#include <windef.h> +#include <windef.h> #include <winuser.h> #include "resource.h"

10 years

[jimtabor] 65674: - Fix build.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 15 01:41:57 2014 New Revision: 65674 URL: http://svn.reactos.org/svn/reactos?rev=65674&view=rev Log: - Fix build. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Mon Dec 15 01:41:57 2014 @@ -1419,6 +1419,27 @@ } } +PWND FASTCALL +co_IntFindChildWindowToOwner(PWND Root, PWND Owner) +{ + PWND Ret; + PWND Child, OwnerWnd; + + for(Child = Root->spwndChild; Child; Child = Child->spwndNext) + { + OwnerWnd = Child->spwndOwner; + if(!OwnerWnd) + continue; + + if(OwnerWnd == Owner) + { + Ret = Child; + return Ret; + } + } + return NULL; +} + BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, UINT first, UINT last) { MSG clk_msg;

10 years

← Newer
1
...
22
23
24
25
26
27
28
...
39
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 December 2014