Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[ekohl] 74981: [SCHEDSVC] Add a loop at the end of SchedServiceMain that will run until a stop event is signaled. This loop will be used to run the schduled jobs.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 10 10:51:49 2017 New Revision: 74981 URL: http://svn.reactos.org/svn/reactos?rev=74981&view=rev Log: [SCHEDSVC] Add a loop at the end of SchedServiceMain that will run until a stop event is signaled. This loop will be used to run the schduled jobs. Modified: trunk/reactos/base/services/schedsvc/schedsvc.c Modified: trunk/reactos/base/services/schedsvc/schedsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/sch… ============================================================================== --- trunk/reactos/base/services/schedsvc/schedsvc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/schedsvc/schedsvc.c [iso-8859-1] Sat Jun 10 10:51:49 2017 @@ -37,6 +37,8 @@ static SERVICE_STATUS_HANDLE ServiceStatusHandle; static SERVICE_STATUS ServiceStatus; +static BOOL bStopService = FALSE; + /* FUNCTIONS *****************************************************************/ static VOID @@ -44,7 +46,14 @@ { ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; ServiceStatus.dwCurrentState = dwState; - ServiceStatus.dwControlsAccepted = 0; + + if (dwState == SERVICE_PAUSED || dwState == SERVICE_RUNNING) + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | + SERVICE_ACCEPT_SHUTDOWN | + SERVICE_ACCEPT_PAUSE_CONTINUE; + else + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = 0; ServiceStatus.dwServiceSpecificExitCode = 0; ServiceStatus.dwCheckPoint = 0; @@ -73,11 +82,12 @@ switch (dwControl) { case SERVICE_CONTROL_STOP: - TRACE(" SERVICE_CONTROL_STOP received\n"); + case SERVICE_CONTROL_SHUTDOWN: + TRACE(" SERVICE_CONTROL_STOP/SERVICE_CONTROL_SHUTDOWN received\n"); UpdateServiceStatus(SERVICE_STOP_PENDING); /* Stop listening to incoming RPC messages */ RpcMgmtStopServerListening(NULL); - UpdateServiceStatus(SERVICE_STOPPED); + bStopService = TRUE; return ERROR_SUCCESS; case SERVICE_CONTROL_PAUSE: @@ -96,14 +106,7 @@ &ServiceStatus); return ERROR_SUCCESS; - case SERVICE_CONTROL_SHUTDOWN: - TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); - UpdateServiceStatus(SERVICE_STOP_PENDING); - RpcMgmtStopServerListening(NULL); - UpdateServiceStatus(SERVICE_STOPPED); - return ERROR_SUCCESS; - - default : + default: TRACE(" Control %lu received\n", dwControl); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -112,7 +115,7 @@ static DWORD -ServiceInit(VOID) +ServiceInit(PHANDLE phEvent) { HANDLE hThread; DWORD dwError; @@ -143,11 +146,19 @@ NULL); if (!hThread) { - ERR("Can't create PortThread\n"); + ERR("Could not create the RPC thread\n"); return GetLastError(); } CloseHandle(hThread); + + /* Create the scheduler event */ + *phEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + if (*phEvent == NULL) + { + ERR("Could not create the scheduler event\n"); + return GetLastError(); + } return ERROR_SUCCESS; } @@ -156,6 +167,7 @@ VOID WINAPI SchedServiceMain(DWORD argc, LPTSTR *argv) { + HANDLE hEvent = NULL; DWORD dwError; UNREFERENCED_PARAMETER(argc); @@ -174,7 +186,7 @@ UpdateServiceStatus(SERVICE_START_PENDING); - dwError = ServiceInit(); + dwError = ServiceInit(&hEvent); if (dwError != ERROR_SUCCESS) { ERR("Service stopped (dwError: %lu\n", dwError); @@ -183,6 +195,23 @@ } UpdateServiceStatus(SERVICE_RUNNING); + + for (;;) + { + /* Leave the loop, if the service has to be stopped */ + if (bStopService) + break; + + /* Wait for the next timeout */ + WaitForSingleObject(hEvent, 5000); + TRACE("Service running!\n"); + } + + /* Close the scheduler event handle */ + CloseHandle(hEvent); + + /* Stop the service */ + UpdateServiceStatus(SERVICE_STOPPED); }

7 years, 6 months

[tfaber] 74980: [NTOS:EX] - Stub NtQuerySystemInformation:SystemExtendedHandleInformation. Avoids crashes in the upcoming ntdll_winetest sync. CORE-13368 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 10 07:59:50 2017 New Revision: 74980 URL: http://svn.reactos.org/svn/reactos?rev=74980&view=rev Log: [NTOS:EX] - Stub NtQuerySystemInformation:SystemExtendedHandleInformation. Avoids crashes in the upcoming ntdll_winetest sync. CORE-13368 #resolve Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/sdk/include/ndk/extypes.h Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Jun 10 07:59:50 2017 @@ -2370,6 +2370,27 @@ } return STATUS_SUCCESS; +} + +/* Class 64 - Extended handle information */ +QSI_DEF(SystemExtendedHandleInformation) +{ + PSYSTEM_HANDLE_INFORMATION_EX HandleInformation = (PSYSTEM_HANDLE_INFORMATION_EX)Buffer; + + DPRINT1("NtQuerySystemInformation - SystemExtendedHandleInformation not implemented\n"); + + /* Set initial required buffer size */ + *ReqSize = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION_EX, Handle); + + /* Validate input size */ + if (Size < *ReqSize) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* FIXME */ + HandleInformation->Count = 0; + return STATUS_NOT_IMPLEMENTED; } @@ -2455,7 +2476,11 @@ SI_QX(SystemExtendedProcessInformation), SI_QX(SystemRecommendedSharedDataAlignment), SI_XX(SystemComPlusPackage), - SI_QX(SystemNumaAvailableMemory) + SI_QX(SystemNumaAvailableMemory), + SI_XX(SystemProcessorPowerInformation), /* FIXME: not implemented */ + SI_XX(SystemEmulationBasicInformation), /* FIXME: not implemented */ + SI_XX(SystemEmulationProcessorInformation), /* FIXME: not implemented */ + SI_QX(SystemExtendedHandleInformation), }; C_ASSERT(SystemBasicInformation == 0); Modified: trunk/reactos/sdk/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/extypes.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/extypes.h [iso-8859-1] Sat Jun 10 07:59:50 2017 @@ -1398,7 +1398,29 @@ }; } SYSTEM_NUMA_INFORMATION, *PSYSTEM_NUMA_INFORMATION; -// FIXME: Class 56-97 +// FIXME: Class 56-63 + +// Class 64 +typedef struct _SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX +{ + PVOID Object; + ULONG_PTR UniqueProcessId; + ULONG_PTR HandleValue; + ULONG GrantedAccess; + USHORT CreatorBackTraceIndex; + USHORT ObjectTypeIndex; + ULONG HandleAttributes; + ULONG Reserved; +} SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX, *PSYSTEM_HANDLE_TABLE_ENTRY_INFO_EX; + +typedef struct _SYSTEM_HANDLE_INFORMATION_EX +{ + ULONG_PTR Count; + ULONG_PTR Reserved; + SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX Handle[1]; +} SYSTEM_HANDLE_INFORMATION_EX, *PSYSTEM_HANDLE_INFORMATION_EX; + +// FIXME: Class 65-97 // // Hotpatch flags

7 years, 6 months

[pschweitzer] 74979: [UDFS] Fix UDFS volume size computation. Note that side effect of this is that free space computation is broken; due to larger bitmap walk. To be fixed... CORE-4375 CORE-13366

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 10 05:45:26 2017 New Revision: 74979 URL: http://svn.reactos.org/svn/reactos?rev=74979&view=rev Log: [UDFS] Fix UDFS volume size computation. Note that side effect of this is that free space computation is broken; due to larger bitmap walk. To be fixed... CORE-4375 CORE-13366 Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/mount.cpp [iso-8859-1] Sat Jun 10 05:45:26 2017 @@ -2044,9 +2044,7 @@ if(Vcb->Partitions[i].PartitionNum == (p->partitionNumber)) { Found = TRUE; Vcb->Partitions[i].PartitionRoot = p->partitionStartingLocation + Vcb->FirstLBA; - Vcb->Partitions[i].PartitionLen = - min(p->partitionLength, - Vcb->LastPossibleLBA - Vcb->Partitions[i].PartitionRoot); /* sectors */ + Vcb->Partitions[i].PartitionLen = p->partitionLength; Vcb->Partitions[i].UspaceBitmap = 0xFFFFFFFF; Vcb->Partitions[i].FspaceBitmap = 0xFFFFFFFF; Vcb->Partitions[i].AccessType = p->accessType;

7 years, 6 months

[akhaldi] 74978: [PSDK] Add some missing definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 9 23:13:23 2017 New Revision: 74978 URL: http://svn.reactos.org/svn/reactos?rev=74978&view=rev Log: [PSDK] Add some missing definitions. Modified: trunk/reactos/sdk/include/psdk/usb200.h Modified: trunk/reactos/sdk/include/psdk/usb200.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/usb200.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/usb200.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/usb200.h [iso-8859-1] Fri Jun 9 23:13:23 2017 @@ -123,4 +123,95 @@ UCHAR iFunction; } USB_INTERFACE_ASSOCIATION_DESCRIPTOR, *PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR; +typedef union _USB_20_PORT_CHANGE { + USHORT AsUshort16; + struct { + USHORT ConnectStatusChange:1; + USHORT PortEnableDisableChange:1; + USHORT SuspendChange:1; + USHORT OverCurrentIndicatorChange:1; + USHORT ResetChange:1; + USHORT Reserved2:11; + }; +} USB_20_PORT_CHANGE, *PUSB_20_PORT_CHANGE; + +C_ASSERT(sizeof(USB_20_PORT_CHANGE) == sizeof(USHORT)); + +typedef union _USB_20_PORT_STATUS { + USHORT AsUshort16; + struct { + USHORT CurrentConnectStatus:1; + USHORT PortEnabledDisabled:1; + USHORT Suspend:1; + USHORT OverCurrent:1; + USHORT Reset:1; + USHORT L1:1; + USHORT Reserved0:2; + USHORT PortPower:1; + USHORT LowSpeedDeviceAttached:1; + USHORT HighSpeedDeviceAttached:1; + USHORT PortTestMode:1; + USHORT PortIndicatorControl:1; + USHORT Reserved1:3; + }; +} USB_20_PORT_STATUS, *PUSB_20_PORT_STATUS; + +C_ASSERT(sizeof(USB_20_PORT_STATUS) == sizeof(USHORT)); + +typedef union _USB_30_PORT_STATUS { + USHORT AsUshort16; + struct { + USHORT CurrentConnectStatus:1; + USHORT PortEnabledDisabled:1; + USHORT Reserved0:1; + USHORT OverCurrent:1; + USHORT Reset:1; + USHORT PortLinkState:4; + USHORT PortPower:1; + USHORT NegotiatedDeviceSpeed:3; + USHORT Reserved1:3; + }; +} USB_30_PORT_STATUS, *PUSB_30_PORT_STATUS; + +C_ASSERT(sizeof(USB_30_PORT_STATUS) == sizeof(USHORT)); + +typedef union _USB_PORT_STATUS { + USHORT AsUshort16; + USB_20_PORT_STATUS Usb20PortStatus; + USB_30_PORT_STATUS Usb30PortStatus; +} USB_PORT_STATUS, *PUSB_PORT_STATUS; + +typedef union _USB_HUB_STATUS { + USHORT AsUshort16; + struct { + USHORT LocalPowerLost:1; + USHORT OverCurrent:1; + USHORT Reserved:14; + }; +} USB_HUB_STATUS, *PUSB_HUB_STATUS; + +C_ASSERT(sizeof(USB_HUB_STATUS) == sizeof(USHORT)); + +#define USB_DEVICE_CLASS_RESERVED 0x00 +#define USB_DEVICE_CLASS_AUDIO 0x01 +#define USB_DEVICE_CLASS_COMMUNICATIONS 0x02 +#define USB_DEVICE_CLASS_HUMAN_INTERFACE 0x03 +#define USB_DEVICE_CLASS_MONITOR 0x04 +#define USB_DEVICE_CLASS_PHYSICAL_INTERFACE 0x05 +#define USB_DEVICE_CLASS_POWER 0x06 +#define USB_DEVICE_CLASS_IMAGE 0x06 +#define USB_DEVICE_CLASS_PRINTER 0x07 +#define USB_DEVICE_CLASS_STORAGE 0x08 +#define USB_DEVICE_CLASS_HUB 0x09 +#define USB_DEVICE_CLASS_CDC_DATA 0x0A +#define USB_DEVICE_CLASS_SMART_CARD 0x0B +#define USB_DEVICE_CLASS_CONTENT_SECURITY 0x0D +#define USB_DEVICE_CLASS_VIDEO 0x0E +#define USB_DEVICE_CLASS_PERSONAL_HEALTHCARE 0x0F +#define USB_DEVICE_CLASS_DIAGNOSTIC_DEVICE 0xDC +#define USB_DEVICE_CLASS_WIRELESS_CONTROLLER 0xE0 +#define USB_DEVICE_CLASS_MISCELLANEOUS 0xEF +#define USB_DEVICE_CLASS_APPLICATION_SPECIFIC 0xFE +#define USB_DEVICE_CLASS_VENDOR_SPECIFIC 0xFF + #include <poppack.h>

7 years, 6 months

[tfaber] 74977: [WIN32K:NTUSER] - Fix fmt range check in NtUserGetClipboardFormatName (see Wine commit 4bdcf512). Fixes new test failures (and resulting debug spam) in user32_winetest:clipboard COR...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 9 21:36:15 2017 New Revision: 74977 URL: http://svn.reactos.org/svn/reactos?rev=74977&view=rev Log: [WIN32K:NTUSER] - Fix fmt range check in NtUserGetClipboardFormatName (see Wine commit 4bdcf512). Fixes new test failures (and resulting debug spam) in user32_winetest:clipboard CORE-13402 #resolve Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Fri Jun 9 21:36:15 2017 @@ -709,7 +709,7 @@ UserEnterShared(); /* If the format is built-in we fail */ - if (fmt < 0xc000) + if (fmt < 0xc000 || fmt > 0xffff) { /* Registetrated formats are >= 0xc000 */ goto cleanup;

7 years, 6 months

[mjansen] 74976: [CALC] Explicitly link against comctl32. Patch by Carlo Bramini. CORE-10727

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri Jun 9 18:21:54 2017 New Revision: 74976 URL: http://svn.reactos.org/svn/reactos?rev=74976&view=rev Log: [CALC] Explicitly link against comctl32. Patch by Carlo Bramini. CORE-10727 Modified: trunk/reactos/base/applications/calc/CMakeLists.txt trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa… ============================================================================== --- trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] Fri Jun 9 18:21:54 2017 @@ -13,7 +13,7 @@ add_rc_deps(resource.rc ${calc_rc_deps}) add_executable(calc ${SOURCE} resource.rc) set_module_type(calc win32gui UNICODE) -add_importlibs(calc advapi32 user32 shell32 gdi32 msvcrt kernel32) +add_importlibs(calc advapi32 comctl32 user32 shell32 gdi32 msvcrt kernel32) if(MSVC) add_importlibs(calc ntdll) Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Fri Jun 9 18:21:54 2017 @@ -4,6 +4,7 @@ #include <wingdi.h> #include <winreg.h> #include <shellapi.h> +#include <commctrl.h> #define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt) @@ -1785,6 +1786,8 @@ MSG msg; DWORD dwLayout; + InitCommonControls(); + calc.hInstance = hInstance; calc.x_coord = -1;

7 years, 6 months

[hbelusca] 74975: [USETUP]: Reshuffle a bit the main-function of USetup.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 9 16:37:53 2017 New Revision: 74975 URL: http://svn.reactos.org/svn/reactos?rev=74975&view=rev Log: [USETUP]: Reshuffle a bit the main-function of USetup. Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Jun 9 16:37:53 2017 @@ -4685,19 +4685,20 @@ /* * The start routine and page management */ -VOID +NTSTATUS RunUSetup(VOID) { + NTSTATUS Status; INPUT_RECORD Ir; PAGE_NUMBER Page; - LARGE_INTEGER Time; - NTSTATUS Status; BOOLEAN Old; + InfSetHeap(ProcessHeap); + /* Tell the Cm this is a setup boot, and it has to behave accordingly */ - NtInitializeRegistry(CM_BOOT_FLAG_SETUP); - - NtQuerySystemTime(&Time); + Status = NtInitializeRegistry(CM_BOOT_FLAG_SETUP); + if (!NT_SUCCESS(Status)) + DPRINT1("NtInitializeRegistry() failed (Status 0x%08lx)\n", Status); /* Create the PnP thread in suspended state */ Status = RtlCreateUserThread(NtCurrentProcess(), @@ -4719,9 +4720,8 @@ PrintString(MUIGetString(STRING_CONSOLEFAIL2)); PrintString(MUIGetString(STRING_CONSOLEFAIL3)); - /* Raise a hard error (crash the system/BSOD) */ - NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, - 0,0,0,0,0); + /* We failed to initialize the video, just quit the installer */ + return STATUS_APP_INIT_FAILURE; } /* Initialize global unicode strings */ @@ -4898,15 +4898,12 @@ FreeConsole(); - /* Avoid bugcheck */ - Time.QuadPart += 50000000; - NtDelayExecution(FALSE, &Time); - /* Reboot */ RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); NtShutdownSystem(ShutdownReboot); RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, Old, FALSE, &Old); - NtTerminateProcess(NtCurrentProcess(), 0); + + return STATUS_SUCCESS; } @@ -4915,12 +4912,40 @@ VOID NTAPI NtProcessStartup(PPEB Peb) { + NTSTATUS Status; + LARGE_INTEGER Time; + RtlNormalizeProcessParams(Peb->ProcessParameters); ProcessHeap = Peb->ProcessHeap; - InfSetHeap(ProcessHeap); - RunUSetup(); + + NtQuerySystemTime(&Time); + + Status = RunUSetup(); + + if (NT_SUCCESS(Status)) + { + /* + * Avoid a bugcheck if RunUSetup() finishes too quickly by implementing + * a protective waiting. + * This wait is needed because, since we are started as SMSS.EXE, + * the NT kernel explicitly waits 5 seconds for the initial process + * SMSS.EXE to initialize (as a protective measure), and otherwise + * bugchecks with the code SESSION5_INITIALIZATION_FAILED. + */ + Time.QuadPart += 50000000; + NtDelayExecution(FALSE, &Time); + } + else + { + /* The installer failed to start: raise a hard error (crash the system/BSOD) */ + Status = NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, + 0, 0, NULL, 0, NULL); + } + + NtTerminateProcess(NtCurrentProcess(), Status); } + #endif /* __REACTOS__ */ /* EOF */

7 years, 6 months

[tfaber] 74974: [USER32_WINETEST] - Hackfix crash in user32:clipboard test due to NULL pointer returned from GetClipboardData.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 9 14:08:50 2017 New Revision: 74974 URL: http://svn.reactos.org/svn/reactos?rev=74974&view=rev Log: [USER32_WINETEST] - Hackfix crash in user32:clipboard test due to NULL pointer returned from GetClipboardData. Modified: trunk/rostests/winetests/user32/clipboard.c Modified: trunk/rostests/winetests/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/clipboar… ============================================================================== --- trunk/rostests/winetests/user32/clipboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/clipboard.c [iso-8859-1] Fri Jun 9 14:08:50 2017 @@ -2004,11 +2004,17 @@ trace( "palette %p\n", h ); h = GetClipboardData( CF_METAFILEPICT ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); +#ifdef __REACTOS__ + if (h != NULL) +#endif ok( GetObjectType( ((METAFILEPICT *)h)->hMF ) == OBJ_METAFILE, "wrong object %p\n", ((METAFILEPICT *)h)->hMF ); trace( "metafile %p\n", h ); h = GetClipboardData( CF_DSPMETAFILEPICT ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); +#ifdef __REACTOS__ + if (h != NULL) +#endif ok( GetObjectType( ((METAFILEPICT *)h)->hMF ) == OBJ_METAFILE, "wrong object %p\n", ((METAFILEPICT *)h)->hMF ); trace( "metafile2 %p\n", h );

7 years, 6 months

[tfaber] 74973: [GDI32] - Check for lpResults == NULL in GetCharacterPlacementA. Patch by Doug Lyons. Fixes crash in gdi32_winetest:font CORE-13401 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 9 11:14:11 2017 New Revision: 74973 URL: http://svn.reactos.org/svn/reactos?rev=74973&view=rev Log: [GDI32] - Check for lpResults == NULL in GetCharacterPlacementA. Patch by Doug Lyons. Fixes crash in gdi32_winetest:font CORE-13401 #resolve Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Fri Jun 9 11:14:11 2017 @@ -385,7 +385,7 @@ DWORD ret; UINT font_cp; - if ( !lpString || uCount <= 0 || (nMaxExtent < 0 && nMaxExtent != -1 ) ) + if ( !lpString || uCount <= 0 || !lpResults || (nMaxExtent < 0 && nMaxExtent != -1 ) ) { SetLastError(ERROR_INVALID_PARAMETER); return 0;

7 years, 6 months

[gadamopoulos] 74972: [EXPLORER] -Use WM_POPUPSYSTEMMENU to open the system menu of a window. CORE-13400

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Jun 9 09:16:44 2017 New Revision: 74972 URL: http://svn.reactos.org/svn/reactos?rev=74972&view=rev Log: [EXPLORER] -Use WM_POPUPSYSTEMMENU to open the system menu of a window. CORE-13400 Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Fri Jun 9 09:16:44 2017 @@ -1532,21 +1532,14 @@ VOID HandleTaskItemRightClick(IN OUT PTASK_ITEM TaskItem) { - - HMENU hmenu = ::GetSystemMenu(TaskItem->hWnd, FALSE); - - if (hmenu) - { - POINT pt; - int cmd; - GetCursorPos(&pt); - cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, 0, m_TaskBar.m_hWnd, NULL); - if (cmd) - { - SetForegroundWindow(TaskItem->hWnd); // reactivate window after the context menu has closed - ::PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, cmd, 0); - } - } + POINT pt; + GetCursorPos(&pt); + + SetForegroundWindow(TaskItem->hWnd); + + ActivateTask(TaskItem->hWnd); + + ::SendMessageW(TaskItem->hWnd, WM_POPUPSYSTEMMENU, 0, MAKELPARAM(pt.x, pt.y)); } VOID HandleTaskGroupRightClick(IN OUT PTASK_GROUP TaskGroup)

7 years, 6 months

← Newer
1
...
25
26
27
28
29
30
31
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017