Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 64925: [NTOS:IO] - Simplify how IopLoadUnloadDriver is called by making the function queue a work item instead of its caller
by tfaber＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: tfaber Date: Thu Oct 23 14:37:51 2014 New Revision: 64925 URL: http://svn.reactos.org/svn/reactos?rev=64925&view=rev Log: [NTOS:IO] - Simplify how IopLoadUnloadDriver is called by making the function queue a work item instead of its caller Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Thu Oct 23 14:37:51 2014 @@ -385,7 +385,7 @@ typedef struct _LOAD_UNLOAD_PARAMS { NTSTATUS Status; - PUNICODE_STRING ServiceName; + PCUNICODE_STRING RegistryPath; WORK_QUEUE_ITEM WorkItem; KEVENT Event; PDRIVER_OBJECT DriverObject; @@ -1083,10 +1083,11 @@ OUT PLDR_DATA_TABLE_ENTRY *ModuleObject ); -VOID +NTSTATUS NTAPI IopLoadUnloadDriver( - IN OUT PLOAD_UNLOAD_PARAMS LoadParams + _In_opt_ PCUNICODE_STRING RegistryPath, + _Inout_ PDRIVER_OBJECT *DriverObject ); NTSTATUS Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Oct 23 14:37:51 2014 @@ -1202,7 +1202,6 @@ PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT DeviceObject; PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; - LOAD_UNLOAD_PARAMS LoadParams; NTSTATUS Status; LPWSTR Start; BOOLEAN SafeToUnload = TRUE; @@ -1346,33 +1345,10 @@ DPRINT1("Unloading driver '%wZ' (manual)\n", &DriverObject->DriverName); - /* Set the unload invoked flag */ + /* Set the unload invoked flag and call the unload routine */ DriverObject->Flags |= DRVO_UNLOAD_INVOKED; - - if (PsGetCurrentProcess() == PsInitialSystemProcess) - { - /* Just call right away */ - (*DriverObject->DriverUnload)(DriverObject); - } - else - { - /* Load/Unload must be called from system process */ - - /* Prepare parameters block */ - LoadParams.DriverObject = DriverObject; - KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); - - ExInitializeWorkItem(&LoadParams.WorkItem, - (PWORKER_THREAD_ROUTINE)IopLoadUnloadDriver, - (PVOID)&LoadParams); - - /* Queue it */ - ExQueueWorkItem(&LoadParams.WorkItem, DelayedWorkQueue); - - /* And wait when it completes */ - KeWaitForSingleObject(&LoadParams.Event, UserRequest, KernelMode, - FALSE, NULL); - } + Status = IopLoadUnloadDriver(NULL, &DriverObject); + NT_ASSERT(Status == STATUS_SUCCESS); /* Mark the driver object temporary, so it could be deleted later */ ObMakeTemporaryObject(DriverObject); @@ -1381,7 +1357,7 @@ ObDereferenceObject(DriverObject); ObDereferenceObject(DriverObject); - return STATUS_SUCCESS; + return Status; } else { @@ -1865,8 +1841,24 @@ return DriverExtensions + 1; } -VOID NTAPI -IopLoadUnloadDriver(PLOAD_UNLOAD_PARAMS LoadParams) +VOID +NTAPI +IopLoadUnloadDriverWorker( + _Inout_ PVOID Parameter) +{ + PLOAD_UNLOAD_PARAMS LoadParams = Parameter; + + NT_ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); + LoadParams->Status = IopLoadUnloadDriver(LoadParams->RegistryPath, + &LoadParams->DriverObject); + KeSetEvent(&LoadParams->Event, 0, FALSE); +} + +NTSTATUS +NTAPI +IopLoadUnloadDriver( + _In_opt_ PCUNICODE_STRING RegistryPath, + _Inout_ PDRIVER_OBJECT *DriverObject) { RTL_QUERY_REGISTRY_TABLE QueryTable[3]; UNICODE_STRING ImagePath; @@ -1874,20 +1866,40 @@ NTSTATUS Status; ULONG Type; PDEVICE_NODE DeviceNode; - PDRIVER_OBJECT DriverObject; PLDR_DATA_TABLE_ENTRY ModuleObject; PVOID BaseAddress; WCHAR *cur; + /* Load/Unload must be called from system process */ + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + LOAD_UNLOAD_PARAMS LoadParams; + + /* Prepare parameters block */ + LoadParams.RegistryPath = RegistryPath; + LoadParams.DriverObject = *DriverObject; + KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); + + /* Initialize and queue a work item */ + ExInitializeWorkItem(&LoadParams.WorkItem, + IopLoadUnloadDriverWorker, + &LoadParams); + ExQueueWorkItem(&LoadParams.WorkItem, DelayedWorkQueue); + + /* And wait till it completes */ + KeWaitForSingleObject(&LoadParams.Event, + UserRequest, + KernelMode, + FALSE, + NULL); + return LoadParams.Status; + } + /* Check if it's an unload request */ - if (LoadParams->DriverObject) - { - (*LoadParams->DriverObject->DriverUnload)(LoadParams->DriverObject); - - /* Return success and signal the event */ - LoadParams->Status = STATUS_SUCCESS; - KeSetEvent(&LoadParams->Event, 0, FALSE); - return; + if (*DriverObject) + { + (*DriverObject)->DriverUnload(*DriverObject); + return STATUS_SUCCESS; } RtlInitUnicodeString(&ImagePath, NULL); @@ -1895,19 +1907,18 @@ /* * Get the service name from the registry key name. */ - ASSERT(LoadParams->ServiceName->Length >= sizeof(WCHAR)); - - ServiceName = *LoadParams->ServiceName; - cur = LoadParams->ServiceName->Buffer + - (LoadParams->ServiceName->Length / sizeof(WCHAR)) - 1; - while (LoadParams->ServiceName->Buffer != cur) + ASSERT(RegistryPath->Length >= sizeof(WCHAR)); + + ServiceName = *RegistryPath; + cur = RegistryPath->Buffer + RegistryPath->Length / sizeof(WCHAR) - 1; + while (RegistryPath->Buffer != cur) { if (*cur == L'\\') { ServiceName.Buffer = cur + 1; - ServiceName.Length = LoadParams->ServiceName->Length - + ServiceName.Length = RegistryPath->Length - (USHORT)((ULONG_PTR)ServiceName.Buffer - - (ULONG_PTR)LoadParams->ServiceName->Buffer); + (ULONG_PTR)RegistryPath->Buffer); break; } cur--; @@ -1930,15 +1941,13 @@ QueryTable[1].EntryContext = &ImagePath; Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - LoadParams->ServiceName->Buffer, + RegistryPath->Buffer, QueryTable, NULL, NULL); if (!NT_SUCCESS(Status)) { DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); if (ImagePath.Buffer) ExFreePool(ImagePath.Buffer); - LoadParams->Status = Status; - KeSetEvent(&LoadParams->Event, 0, FALSE); - return; + return Status; } /* @@ -1949,9 +1958,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); - LoadParams->Status = Status; - KeSetEvent(&LoadParams->Event, 0, FALSE); - return; + return Status; } DPRINT("FullImagePath: '%wZ'\n", &ImagePath); @@ -1961,7 +1968,7 @@ * Get existing DriverObject pointer (in case the driver * has already been loaded and initialized). */ - Status = IopGetDriverObject(&DriverObject, + Status = IopGetDriverObject(DriverObject, &ServiceName, (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || Type == 8 /* SERVICE_RECOGNIZER_DRIVER */)); @@ -1977,9 +1984,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); - LoadParams->Status = Status; - KeSetEvent(&LoadParams->Event, 0, FALSE); - return; + return Status; } /* @@ -1990,9 +1995,7 @@ { DPRINT1("IopCreateDeviceNode() failed (Status %lx)\n", Status); MmUnloadSystemImage(ModuleObject); - LoadParams->Status = Status; - KeSetEvent(&LoadParams->Event, 0, FALSE); - return; + return Status; } IopDisplayLoadingMessage(&DeviceNode->ServiceName); @@ -2002,19 +2005,17 @@ &DeviceNode->ServiceName, (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), - &DriverObject); + DriverObject); if (!NT_SUCCESS(Status)) { DPRINT1("IopInitializeDriverModule() failed (Status %lx)\n", Status); MmUnloadSystemImage(ModuleObject); IopFreeDeviceNode(DeviceNode); - LoadParams->Status = Status; - KeSetEvent(&LoadParams->Event, 0, FALSE); - return; + return Status; } /* Initialize and start device */ - IopInitializeDevice(DeviceNode, DriverObject); + IopInitializeDevice(DeviceNode, *DriverObject); Status = IopStartDevice(DeviceNode); } else @@ -2023,12 +2024,10 @@ Status = STATUS_IMAGE_ALREADY_LOADED; /* IopGetDriverObject references the DriverObject, so dereference it */ - ObDereferenceObject(DriverObject); - } - - /* Pass status to the caller and signal the event */ - LoadParams->Status = Status; - KeSetEvent(&LoadParams->Event, 0, FALSE); + ObDereferenceObject(*DriverObject); + } + + return Status; } /* @@ -2051,7 +2050,7 @@ { UNICODE_STRING CapturedDriverServiceName = { 0, 0, NULL }; KPROCESSOR_MODE PreviousMode; - LOAD_UNLOAD_PARAMS LoadParams; + PDRIVER_OBJECT DriverObject; NTSTATUS Status; PAGED_CODE(); @@ -2081,35 +2080,14 @@ DPRINT("NtLoadDriver('%wZ')\n", &CapturedDriverServiceName); - LoadParams.ServiceName = &CapturedDriverServiceName; - LoadParams.DriverObject = NULL; - KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); - - /* Call the load/unload routine, depending on current process */ - if (PsGetCurrentProcess() == PsInitialSystemProcess) - { - /* Just call right away */ - IopLoadUnloadDriver(&LoadParams); - } - else - { - /* Load/Unload must be called from system process */ - ExInitializeWorkItem(&LoadParams.WorkItem, - (PWORKER_THREAD_ROUTINE)IopLoadUnloadDriver, - (PVOID)&LoadParams); - - /* Queue it */ - ExQueueWorkItem(&LoadParams.WorkItem, DelayedWorkQueue); - - /* And wait when it completes */ - KeWaitForSingleObject(&LoadParams.Event, UserRequest, KernelMode, - FALSE, NULL); - } + /* Load driver and call its entry point */ + DriverObject = NULL; + Status = IopLoadUnloadDriver(&CapturedDriverServiceName, &DriverObject); ReleaseCapturedUnicodeString(&CapturedDriverServiceName, PreviousMode); - return LoadParams.Status; + return Status; } /*

1 0

[akhaldi] 64924: [USER32] * Merge r64866 from the shell branch which had: * Fix wrong array length passed to GetClassNameW. CID 716222 * Replace other instances of explicit array length to GetWindo...
by akhaldi＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: akhaldi Date: Thu Oct 23 12:24:07 2014 New Revision: 64924 URL: http://svn.reactos.org/svn/reactos?rev=64924&view=rev Log: [USER32] * Merge r64866 from the shell branch which had: * Fix wrong array length passed to GetClassNameW. CID 716222 * Replace other instances of explicit array length to GetWindowTextW with _countof(x). Based on a patch by Christoph von Wittich. Modified: trunk/reactos/ (props changed) trunk/reactos/win32ss/user/user32/controls/appswitch.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 23 12:24:07 2014 @@ -13,6 +13,7 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/ros-branch-0_3_15-lt2013:59059 /branches/ros-csrss:57561-58762 +/branches/shell-experiments:64866 /branches/shell32_new-bringup:51893-53652,53661,53700 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] Thu Oct 23 12:24:07 2014 @@ -83,7 +83,7 @@ { HWND hwnd = windowList[selectedWindow]; - GetWindowTextW(hwnd, windowText, 1023); + GetWindowTextW(hwnd, windowText, _countof(windowText)); TRACE("[ATbot] CompleteSwitch Switching to 0x%08x (%ls)\n", hwnd, windowText); @@ -103,9 +103,9 @@ if (!IsWindowVisible(window)) return TRUE; - GetClassNameW(window,windowText,4095); - if ((wcscmp(L"Shell_TrayWnd",windowText)==0) || - (wcscmp(L"Progman",windowText)==0) ) + GetClassNameW(window, windowText, _countof(windowText)); + if ((wcscmp(L"Shell_TrayWnd", windowText)==0) || + (wcscmp(L"Progman", windowText)==0) ) return TRUE; // First try to get the big icon assigned to the window @@ -194,7 +194,7 @@ HPEN hPen; HFONT dcFont; COLORREF cr; - int nch = GetWindowTextW(windowList[selectedWindow], windowText, 1023); + int nch = GetWindowTextW(windowList[selectedWindow], windowText, _countof(windowText)); dialogDC = BeginPaint(hWnd, &paint); { @@ -373,7 +373,7 @@ } TRACE("DoAppSwitch VK_ESCAPE 1 Count %d windowCount %d\n",Count,windowCount); hwnd = windowList[Count]; - GetWindowTextW(hwnd, Text, 1023); + GetWindowTextW(hwnd, Text, _countof(Text)); TRACE("[ATbot] Switching to 0x%08x (%ls)\n", hwnd, Text); MakeWindowActive(hwnd); Esc = TRUE; @@ -456,7 +456,7 @@ Count = windowCount - 1; } hwnd = windowList[Count]; - GetWindowTextW(hwnd, Text, 1023); + GetWindowTextW(hwnd, Text, _countof(Text)); MakeWindowActive(hwnd); } }

1 0

[hbelusca] 64923: [NTVDM]: Addendum to revision 64917: remove unnecessary casts.
by hbelusca＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: hbelusca Date: Thu Oct 23 12:21:46 2014 New Revision: 64923 URL: http://svn.reactos.org/svn/reactos?rev=64923&view=rev Log: [NTVDM]: Addendum to revision 64917: remove unnecessary casts. Modified: trunk/reactos/subsystems/ntvdm/io.c trunk/reactos/subsystems/ntvdm/io.h Modified: trunk/reactos/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/io.c?rev=… ============================================================================== --- trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] Thu Oct 23 12:21:46 2014 @@ -70,7 +70,7 @@ { UCHAR Data; ASSERT(Port <= MAXWORD); - IoPortProc[Port].VddIoHandlers.inb_handler((WORD)Port, &Data); + IoPortProc[Port].VddIoHandlers.inb_handler(Port, &Data); return Data; } else @@ -82,7 +82,7 @@ } VOID -IOReadStrB(USHORT Port, +IOReadStrB(USHORT Port, PUCHAR Buffer, ULONG Count) { @@ -96,7 +96,7 @@ { ASSERT(Port <= MAXWORD); ASSERT(Count <= MAXWORD); - IoPortProc[Port].VddIoHandlers.insb_handler((WORD)Port, Buffer, (WORD)Count); + IoPortProc[Port].VddIoHandlers.insb_handler(Port, Buffer, (WORD)Count); } else { @@ -106,7 +106,7 @@ VOID IOWriteB(USHORT Port, - UCHAR Buffer) + UCHAR Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && IoPortProc[Port].IoHandlers.OutB) @@ -117,7 +117,7 @@ IoPortProc[Port].VddIoHandlers.outb_handler) { ASSERT(Port <= MAXWORD); - IoPortProc[Port].VddIoHandlers.outb_handler((WORD)Port, Buffer); + IoPortProc[Port].VddIoHandlers.outb_handler(Port, Buffer); } else { @@ -127,7 +127,7 @@ } VOID -IOWriteStrB(USHORT Port, +IOWriteStrB(USHORT Port, PUCHAR Buffer, ULONG Count) { @@ -141,7 +141,7 @@ { ASSERT(Port <= MAXWORD); ASSERT(Count <= MAXWORD); - IoPortProc[Port].VddIoHandlers.outsb_handler((WORD)Port, Buffer, (WORD)Count); + IoPortProc[Port].VddIoHandlers.outsb_handler(Port, Buffer, (WORD)Count); } else { @@ -162,7 +162,7 @@ { USHORT Data; ASSERT(Port <= MAXWORD); - IoPortProc[Port].VddIoHandlers.inw_handler((WORD)Port, &Data); + IoPortProc[Port].VddIoHandlers.inw_handler(Port, &Data); return Data; } else @@ -177,7 +177,7 @@ } VOID -IOReadStrW(USHORT Port, +IOReadStrW(USHORT Port, PUSHORT Buffer, ULONG Count) { @@ -191,7 +191,7 @@ { ASSERT(Port <= MAXWORD); ASSERT(Count <= MAXWORD); - IoPortProc[Port].VddIoHandlers.insw_handler((WORD)Port, Buffer, (WORD)Count); + IoPortProc[Port].VddIoHandlers.insw_handler(Port, Buffer, (WORD)Count); } else { @@ -200,7 +200,7 @@ } VOID -IOWriteW(USHORT Port, +IOWriteW(USHORT Port, USHORT Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && @@ -212,7 +212,7 @@ IoPortProc[Port].VddIoHandlers.outw_handler) { ASSERT(Port <= MAXWORD); - IoPortProc[Port].VddIoHandlers.outw_handler((WORD)Port, Buffer); + IoPortProc[Port].VddIoHandlers.outw_handler(Port, Buffer); } else { @@ -223,7 +223,7 @@ } VOID -IOWriteStrW(USHORT Port, +IOWriteStrW(USHORT Port, PUSHORT Buffer, ULONG Count) { @@ -237,7 +237,7 @@ { ASSERT(Port <= MAXWORD); ASSERT(Count <= MAXWORD); - IoPortProc[Port].VddIoHandlers.outsw_handler((WORD)Port, Buffer, (WORD)Count); + IoPortProc[Port].VddIoHandlers.outsw_handler(Port, Buffer, (WORD)Count); } else { @@ -265,7 +265,7 @@ } VOID -IOReadStrD(USHORT Port, +IOReadStrD(USHORT Port, PULONG Buffer, ULONG Count) { @@ -282,7 +282,7 @@ VOID IOWriteD(USHORT Port, - ULONG Buffer) + ULONG Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && IoPortProc[Port].IoHandlers.OutD) @@ -298,7 +298,7 @@ } VOID -IOWriteStrD(USHORT Port, +IOWriteStrD(USHORT Port, PULONG Buffer, ULONG Count) { Modified: trunk/reactos/subsystems/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/io.h?rev=… ============================================================================== --- trunk/reactos/subsystems/ntvdm/io.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/io.h [iso-8859-1] Thu Oct 23 12:21:46 2014 @@ -36,45 +36,45 @@ UCHAR IOReadB(USHORT Port); VOID -IOReadStrB(USHORT Port, +IOReadStrB(USHORT Port, PUCHAR Buffer, ULONG Count); VOID IOWriteB(USHORT Port, - UCHAR Buffer); + UCHAR Buffer); VOID -IOWriteStrB(USHORT Port, +IOWriteStrB(USHORT Port, PUCHAR Buffer, ULONG Count); USHORT IOReadW(USHORT Port); VOID -IOReadStrW(USHORT Port, +IOReadStrW(USHORT Port, PUSHORT Buffer, ULONG Count); VOID -IOWriteW(USHORT Port, +IOWriteW(USHORT Port, USHORT Buffer); VOID -IOWriteStrW(USHORT Port, +IOWriteStrW(USHORT Port, PUSHORT Buffer, ULONG Count); ULONG IOReadD(USHORT Port); VOID -IOReadStrD(USHORT Port, +IOReadStrD(USHORT Port, PULONG Buffer, ULONG Count); VOID IOWriteD(USHORT Port, - ULONG Buffer); + ULONG Buffer); VOID -IOWriteStrD(USHORT Port, +IOWriteStrD(USHORT Port, PULONG Buffer, ULONG Count);

1 0

[akhaldi] 64922: * Sync up to trunk head (r64921).
by akhaldi＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: akhaldi Date: Thu Oct 23 12:17:44 2014 New Revision: 64922 URL: http://svn.reactos.org/svn/reactos?rev=64922&view=rev Log: * Sync up to trunk head (r64921). Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/mscutils/servman/export.c branches/shell-experiments/dll/win32/advapi32/advapi32.h branches/shell-experiments/dll/win32/advapi32/advapi32.spec branches/shell-experiments/dll/win32/advapi32/crypt/crypt.c branches/shell-experiments/dll/win32/advapi32/crypt/crypt.h branches/shell-experiments/dll/win32/advapi32/sec/cred.c branches/shell-experiments/dll/win32/kernel32/winnls/string/lang.c branches/shell-experiments/drivers/input/i8042prt/keyboard.c branches/shell-experiments/include/asm/kxarm.h branches/shell-experiments/include/ddk/wdm.h branches/shell-experiments/include/psdk/winbase.h branches/shell-experiments/include/reactos/libs/fast486/fast486.h branches/shell-experiments/include/xdk/rtlfuncs.h branches/shell-experiments/lib/fast486/fast486.c branches/shell-experiments/lib/rtl/bitmap.c branches/shell-experiments/lib/sdk/crt/except/arm/chkstk_asm.s branches/shell-experiments/lib/sdk/crt/oldnames-msvcrt.S branches/shell-experiments/lib/sdk/crt/stdlib/errno.c branches/shell-experiments/media/doc/README.WINE branches/shell-experiments/ntoskrnl/io/iomgr/driver.c branches/shell-experiments/ntoskrnl/io/iomgr/error.c branches/shell-experiments/ntoskrnl/io/iomgr/ramdisk.c branches/shell-experiments/ntoskrnl/io/iomgr/remlock.c branches/shell-experiments/ntoskrnl/io/iomgr/volume.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpinit.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpmgr.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpreport.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpres.c branches/shell-experiments/ntoskrnl/io/pnpmgr/pnputil.c branches/shell-experiments/subsystems/ntvdm/emulator.c branches/shell-experiments/subsystems/ntvdm/hardware/cmos.c branches/shell-experiments/subsystems/ntvdm/hardware/pic.c branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c branches/shell-experiments/subsystems/ntvdm/hardware/timer.c branches/shell-experiments/subsystems/ntvdm/hardware/vga.c branches/shell-experiments/subsystems/ntvdm/io.c branches/shell-experiments/subsystems/ntvdm/io.h branches/shell-experiments/win32ss/CMakeLists.txt branches/shell-experiments/win32ss/user/ntuser/class.c branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c branches/shell-experiments/win32ss/user/ntuser/keyboard.c branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/user32/windows/class.c branches/shell-experiments/win32ss/user/user32/windows/cursoricon_new.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/mscutils/servman/export.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/crypt/crypt.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/input… Modified: branches/shell-experiments/include/asm/kxarm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/asm/k… Modified: branches/shell-experiments/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ddk/w… Modified: branches/shell-experiments/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/xdk/r… Modified: branches/shell-experiments/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fast486/f… Modified: branches/shell-experiments/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/rtl/bitma… Modified: branches/shell-experiments/lib/sdk/crt/except/arm/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/e… Modified: branches/shell-experiments/lib/sdk/crt/oldnames-msvcrt.S URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/o… Modified: branches/shell-experiments/lib/sdk/crt/stdlib/errno.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/doc/REA… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/ntoskrnl/io/pnpmgr/pnputil.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/p… Modified: branches/shell-experiments/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/CMake… Modified: branches/shell-experiments/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

1 0

[jgardou] 64921: [WIN32SS] - In an incredibly daring move, enable the long awaited new cursors & icons implementation, featuring: - Alpha channeled cursors - Animated cursors (only the first frame ...
by jgardou＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: jgardou Date: Thu Oct 23 11:46:06 2014 New Revision: 64921 URL: http://svn.reactos.org/svn/reactos?rev=64921&view=rev Log: [WIN32SS] - In an incredibly daring move, enable the long awaited new cursors & icons implementation, featuring: - Alpha channeled cursors - Animated cursors (only the first frame is displayed now) - Less leaks (tm) - Tests that pass(tm) - Copying icons and cursors from DLL resources, for beautifuler ReactOS, your turn gigaherz ;-) - A lot of other things which I am very proud of. CORE-7575 #resolve Modified: trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Thu Oct 23 11:46:06 2014 @@ -1,6 +1,6 @@ set(USE_DIBLIB FALSE) -set(USE_NEW_CURSORICON FALSE) +set(USE_NEW_CURSORICON TRUE) # Give WIN32 subsystem its own project. PROJECT(WIN32SS)

1 0

[jgardou] 64920: [WIN32K] - Use shared icon handles when copying the small class icon from the larger one. CORE-7575
by jgardou＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: jgardou Date: Thu Oct 23 11:46:01 2014 New Revision: 64920 URL: http://svn.reactos.org/svn/reactos?rev=64920&view=rev Log: [WIN32K] - Use shared icon handles when copying the small class icon from the larger one. CORE-7575 Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Thu Oct 23 11:46:01 2014 @@ -248,10 +248,10 @@ #ifdef NEW_CURSORICON if (Class->spicn) UserDereferenceObject(Class->spicn); + if (Class->spcur) + UserDereferenceObject(Class->spcur); if (Class->spicnSm) UserDereferenceObject(Class->spicnSm); - if (Class->spcur) - UserDereferenceObject(Class->spcur); #else if (Class->hIconSmIntern) IntClassDestroyIcon(Class->hIconSmIntern); @@ -1976,18 +1976,31 @@ if (NewLong && !Class->spicnSm) { /* Create the new small icon from the new large(?) one */ - HICON SmallIconHandle = co_IntCopyImage( - (HICON)NewLong, - IMAGE_ICON, - UserGetSystemMetrics( SM_CXSMICON ), - UserGetSystemMetrics( SM_CYSMICON ), - 0); + HICON SmallIconHandle = NULL; + if((NewIcon->CURSORF_flags & (CURSORF_LRSHARED | CURSORF_FROMRESOURCE)) + == (CURSORF_LRSHARED | CURSORF_FROMRESOURCE)) + { + SmallIconHandle = co_IntCopyImage( + (HICON)NewLong, + IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE | LR_SHARED); + } + if (!SmallIconHandle) + { + /* Retry without copying from resource */ + SmallIconHandle = co_IntCopyImage( + (HICON)NewLong, + IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), + LR_SHARED); + } if (SmallIconHandle) { /* So use it */ NewSmallIcon = Class->spicnSm = UserGetCurIconObject(SmallIconHandle); - /* Let the handle go, we have the reference on the object */ - NtUserDestroyCursor(SmallIconHandle, FALSE); Class->CSF_flags |= CSF_CACHEDSMICON; } } Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Oct 23 11:46:01 2014 @@ -1677,17 +1677,31 @@ #ifdef NEW_CURSORICON if (Class->spicn && !Class->spicnSm) { - HICON IconSmHandle = co_IntCopyImage( - UserHMGetHandle(Class->spicn), - IMAGE_ICON, - UserGetSystemMetrics( SM_CXSMICON ), - UserGetSystemMetrics( SM_CYSMICON ), - 0); + HICON IconSmHandle = NULL; + if((Class->spicn->CURSORF_flags & (CURSORF_LRSHARED | CURSORF_FROMRESOURCE)) + == (CURSORF_LRSHARED | CURSORF_FROMRESOURCE)) + { + IconSmHandle = co_IntCopyImage( + UserHMGetHandle(Class->spicn), + IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE | LR_SHARED); + } + if (!IconSmHandle) + { + /* Retry without copying from resource */ + IconSmHandle = co_IntCopyImage( + UserHMGetHandle(Class->spicn), + IMAGE_ICON, + UserGetSystemMetrics( SM_CXSMICON ), + UserGetSystemMetrics( SM_CYSMICON ), + LR_SHARED); + } + if (IconSmHandle) { Class->spicnSm = UserGetCurIconObject(IconSmHandle); - /* We can delete the handle, only the pointer is of interest */ - NtUserDestroyCursor(IconSmHandle, FALSE); Class->CSF_flags |= CSF_CACHEDSMICON; } }

1 0

[jgardou] 64919: [USER32] - Implement CopyImage(LR_SHARED) case. CORE-7575
by jgardou＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: jgardou Date: Thu Oct 23 11:45:55 2014 New Revision: 64919 URL: http://svn.reactos.org/svn/reactos?rev=64919&view=rev Log: [USER32] - Implement CopyImage(LR_SHARED) case. CORE-7575 Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Thu Oct 23 11:45:55 2014 @@ -1684,8 +1684,9 @@ { HICON ret = NULL; ICONINFO ii; - - if(fuFlags & LR_COPYFROMRESOURCE) + CURSORDATA CursorData; + + if (fuFlags & LR_COPYFROMRESOURCE) { /* Get the icon module/resource names */ UNICODE_STRING ustrModule; @@ -1697,14 +1698,14 @@ ustrRsrc.MaximumLength = 256; ustrModule.Buffer = HeapAlloc(GetProcessHeap(), 0, ustrModule.MaximumLength); - if(!ustrModule.Buffer) + if (!ustrModule.Buffer) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } /* Keep track of the buffer for the resource, NtUserGetIconInfo might overwrite it */ pvBuf = HeapAlloc(GetProcessHeap(), 0, ustrRsrc.MaximumLength); - if(!pvBuf) + if (!pvBuf) { HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1745,7 +1746,7 @@ { ustrRsrc.MaximumLength *= 2; pvBuf = HeapReAlloc(GetProcessHeap(), 0, ustrRsrc.Buffer, ustrRsrc.MaximumLength); - if(!pvBuf) + if (!pvBuf) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto leave; @@ -1756,11 +1757,11 @@ /* NULL-terminate our strings */ ustrModule.Buffer[ustrModule.Length/sizeof(WCHAR)] = 0; - if(!IS_INTRESOURCE(ustrRsrc.Buffer)) + if (!IS_INTRESOURCE(ustrRsrc.Buffer)) ustrRsrc.Buffer[ustrRsrc.Length/sizeof(WCHAR)] = 0; /* Get the module handle */ - if(!GetModuleHandleExW(0, ustrModule.Buffer, &hModule)) + if (!GetModuleHandleExW(0, ustrModule.Buffer, &hModule)) { /* This should never happen */ ERR("Invalid handle?.\n"); @@ -1769,7 +1770,13 @@ } /* Call the relevant function */ - ret = CURSORICON_LoadImageW(hModule, ustrRsrc.Buffer, cxDesired, cyDesired, fuFlags & LR_DEFAULTSIZE, bIcon); + ret = CURSORICON_LoadImageW( + hModule, + ustrRsrc.Buffer, + cxDesired, + cyDesired, + fuFlags & (LR_DEFAULTSIZE | LR_SHARED), + bIcon); FreeLibrary(hModule); @@ -1784,21 +1791,37 @@ } /* This is a regular copy */ - if(fuFlags & ~LR_COPYDELETEORG) + if (fuFlags & ~(LR_COPYDELETEORG | LR_SHARED)) FIXME("Unimplemented flags: 0x%08x\n", fuFlags); - if(!GetIconInfo(hicon, &ii)) + if (!GetIconInfo(hicon, &ii)) { ERR("GetIconInfo failed.\n"); return NULL; } - - ret = CreateIconIndirect(&ii); - + + /* This is CreateIconIndirect with the LR_SHARED coat added */ + if (!CURSORICON_GetCursorDataFromIconInfo(&CursorData, &ii)) + goto Leave; + + if (fuFlags & LR_SHARED) + CursorData.CURSORF_flags |= CURSORF_LRSHARED; + + ret = NtUserxCreateEmptyCurObject(FALSE); + if (!ret) + goto Leave; + + if (!NtUserSetCursorIconData(ret, NULL, NULL, &CursorData)) + { + NtUserDestroyCursor(ret, TRUE); + goto Leave; + } + +Leave: DeleteObject(ii.hbmMask); - if(ii.hbmColor) DeleteObject(ii.hbmColor); - - if(ret && (fuFlags & LR_COPYDELETEORG)) + if (ii.hbmColor) DeleteObject(ii.hbmColor); + + if (ret && (fuFlags & LR_COPYDELETEORG)) DestroyIcon(hicon); return ret;

1 0

[jgardou] 64918: [USER32] - Cursoricon objects are allocated on the user heap, not the desktop heap. CORE-7575
by jgardou＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: jgardou Date: Thu Oct 23 11:45:50 2014 New Revision: 64918 URL: http://svn.reactos.org/svn/reactos?rev=64918&view=rev Log: [USER32] - Cursoricon objects are allocated on the user heap, not the desktop heap. CORE-7575 Modified: trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Thu Oct 23 11:45:50 2014 @@ -714,15 +714,15 @@ break; #ifdef NEW_CURSORICON case GCLP_HCURSOR: - Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spcur))->h : 0; + Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spcur))->h : 0; break; case GCLP_HICON: - Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicn))->h : 0; + Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicn))->h : 0; break; case GCLP_HICONSM: - Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicnSm))->h : 0; + Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicnSm))->h : 0; break; #else case GCLP_HCURSOR: @@ -805,15 +805,15 @@ #ifdef NEW_CURSORICON case GCLP_HCURSOR: - Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spcur))->h : 0; + Ret = Class->spcur ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spcur))->h : 0; break; case GCLP_HICON: - Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicn))->h : 0; + Ret = Class->spicn ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicn))->h : 0; break; case GCLP_HICONSM: - Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)DesktopPtrToUser(Class->spicnSm))->h : 0; + Ret = Class->spicnSm ? (ULONG_PTR)((PPROCMARKHEAD)SharedPtrToUser(Class->spicnSm))->h : 0; break; #else case GCLP_HCURSOR:

1 0

[aandrejevic] 64917: [FAST486][NTVDM] Arch, I/O port numbers should always be stored in USHORT variables!
by aandrejevic＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: aandrejevic Date: Thu Oct 23 11:44:07 2014 New Revision: 64917 URL: http://svn.reactos.org/svn/reactos?rev=64917&view=rev Log: [FAST486][NTVDM] Arch, I/O port numbers should always be stored in USHORT variables! Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/fast486.c trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/hardware/cmos.c trunk/reactos/subsystems/ntvdm/hardware/pic.c trunk/reactos/subsystems/ntvdm/hardware/ps2.c trunk/reactos/subsystems/ntvdm/hardware/timer.c trunk/reactos/subsystems/ntvdm/hardware/vga.c trunk/reactos/subsystems/ntvdm/io.c trunk/reactos/subsystems/ntvdm/io.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -190,7 +190,7 @@ (NTAPI *FAST486_IO_READ_PROC) ( PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize @@ -201,7 +201,7 @@ (NTAPI *FAST486_IO_WRITE_PROC) ( PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -149,7 +149,7 @@ static VOID NTAPI -Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) +Fast486IoReadCallback(PFAST486_STATE State, USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Port); @@ -160,7 +160,7 @@ static VOID NTAPI -Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) +Fast486IoWriteCallback(PFAST486_STATE State, USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Port); Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -273,12 +273,12 @@ DebugBreak(); } -static BYTE WINAPI Port61hRead(ULONG Port) +static BYTE WINAPI Port61hRead(USHORT Port) { return Port61hState; } -static VOID WINAPI Port61hWrite(ULONG Port, BYTE Data) +static VOID WINAPI Port61hWrite(USHORT Port, BYTE Data) { // BOOLEAN SpeakerStateChange = FALSE; BYTE OldPort61hState = Port61hState; Modified: trunk/reactos/subsystems/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/cmos.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -342,13 +342,13 @@ SelectedRegister = CMOS_REG_STATUS_D; } -BYTE WINAPI CmosReadPort(ULONG Port) +BYTE WINAPI CmosReadPort(USHORT Port) { ASSERT(Port == CMOS_DATA_PORT); return CmosReadData(); } -VOID WINAPI CmosWritePort(ULONG Port, BYTE Data) +VOID WINAPI CmosWritePort(USHORT Port, BYTE Data) { if (Port == CMOS_ADDRESS_PORT) CmosWriteAddress(Data); Modified: trunk/reactos/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -154,7 +154,7 @@ Pic->Initialization = FALSE; } -static BYTE WINAPI PicReadPort(ULONG Port) +static BYTE WINAPI PicReadPort(USHORT Port) { switch (Port) { @@ -174,7 +174,7 @@ return 0; } -static VOID WINAPI PicWritePort(ULONG Port, BYTE Data) +static VOID WINAPI PicWritePort(USHORT Port, BYTE Data) { switch (Port) { Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -59,7 +59,7 @@ if (Port->DeviceCommand) Port->DeviceCommand(Port->Param, Command); } -static BYTE WINAPI PS2ReadPort(ULONG Port) +static BYTE WINAPI PS2ReadPort(USHORT Port) { if (Port == PS2_CONTROL_PORT) { @@ -87,7 +87,7 @@ return 0; } -static VOID WINAPI PS2WritePort(ULONG Port, BYTE Data) +static VOID WINAPI PS2WritePort(USHORT Port, BYTE Data) { if (Port == PS2_CONTROL_PORT) { Modified: trunk/reactos/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/timer.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -275,7 +275,7 @@ } } -static BYTE WINAPI PitReadPort(ULONG Port) +static BYTE WINAPI PitReadPort(USHORT Port) { switch (Port) { @@ -290,7 +290,7 @@ return 0; } -static VOID WINAPI PitWritePort(ULONG Port, BYTE Data) +static VOID WINAPI PitWritePort(USHORT Port, BYTE Data) { switch (Port) { Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -1462,7 +1462,7 @@ CursorMoved = FALSE; } -static BYTE WINAPI VgaReadPort(ULONG Port) +static BYTE WINAPI VgaReadPort(USHORT Port) { DPRINT("VgaReadPort: Port 0x%X\n", Port); @@ -1554,7 +1554,7 @@ return 0; } -static VOID WINAPI VgaWritePort(ULONG Port, BYTE Data) +static VOID WINAPI VgaWritePort(USHORT Port, BYTE Data) { DPRINT("VgaWritePort: Port 0x%X, Data 0x%02X\n", Port, Data); Modified: trunk/reactos/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/io.c?rev=… ============================================================================== --- trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -58,7 +58,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ UCHAR -IOReadB(ULONG Port) +IOReadB(USHORT Port) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && IoPortProc[Port].IoHandlers.InB) @@ -82,7 +82,7 @@ } VOID -IOReadStrB(ULONG Port, +IOReadStrB(USHORT Port, PUCHAR Buffer, ULONG Count) { @@ -105,7 +105,7 @@ } VOID -IOWriteB(ULONG Port, +IOWriteB(USHORT Port, UCHAR Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && @@ -127,7 +127,7 @@ } VOID -IOWriteStrB(ULONG Port, +IOWriteStrB(USHORT Port, PUCHAR Buffer, ULONG Count) { @@ -150,7 +150,7 @@ } USHORT -IOReadW(ULONG Port) +IOReadW(USHORT Port) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && IoPortProc[Port].IoHandlers.InW) @@ -177,7 +177,7 @@ } VOID -IOReadStrW(ULONG Port, +IOReadStrW(USHORT Port, PUSHORT Buffer, ULONG Count) { @@ -200,7 +200,7 @@ } VOID -IOWriteW(ULONG Port, +IOWriteW(USHORT Port, USHORT Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && @@ -223,7 +223,7 @@ } VOID -IOWriteStrW(ULONG Port, +IOWriteStrW(USHORT Port, PUSHORT Buffer, ULONG Count) { @@ -246,7 +246,7 @@ } ULONG -IOReadD(ULONG Port) +IOReadD(USHORT Port) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && IoPortProc[Port].IoHandlers.InD) @@ -265,7 +265,7 @@ } VOID -IOReadStrD(ULONG Port, +IOReadStrD(USHORT Port, PULONG Buffer, ULONG Count) { @@ -281,7 +281,7 @@ } VOID -IOWriteD(ULONG Port, +IOWriteD(USHORT Port, ULONG Buffer) { if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && @@ -298,7 +298,7 @@ } VOID -IOWriteStrD(ULONG Port, +IOWriteStrD(USHORT Port, PULONG Buffer, ULONG Count) { @@ -314,7 +314,7 @@ } -VOID RegisterIoPort(ULONG Port, +VOID RegisterIoPort(USHORT Port, EMULATOR_INB_PROC InHandler, EMULATOR_OUTB_PROC OutHandler) { @@ -332,7 +332,7 @@ IoPortProc[Port].hVdd = INVALID_HANDLE_VALUE; } -VOID UnregisterIoPort(ULONG Port) +VOID UnregisterIoPort(USHORT Port) { /* * Put automagically all the fields to zero: @@ -344,7 +344,7 @@ VOID WINAPI EmulatorReadIo(PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) @@ -419,7 +419,7 @@ VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) Modified: trunk/reactos/subsystems/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/io.h?rev=… ============================================================================== --- trunk/reactos/subsystems/ntvdm/io.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/io.h [iso-8859-1] Thu Oct 23 11:44:07 2014 @@ -16,79 +16,79 @@ /* FUNCTIONS ******************************************************************/ -typedef UCHAR (WINAPI *EMULATOR_INB_PROC)(ULONG Port); -typedef USHORT (WINAPI *EMULATOR_INW_PROC)(ULONG Port); -typedef ULONG (WINAPI *EMULATOR_IND_PROC)(ULONG Port); +typedef UCHAR (WINAPI *EMULATOR_INB_PROC)(USHORT Port); +typedef USHORT (WINAPI *EMULATOR_INW_PROC)(USHORT Port); +typedef ULONG (WINAPI *EMULATOR_IND_PROC)(USHORT Port); -typedef VOID (WINAPI *EMULATOR_INSB_PROC)(ULONG Port, PUCHAR Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_INSW_PROC)(ULONG Port, PUSHORT Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_INSD_PROC)(ULONG Port, PULONG Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_INSB_PROC)(USHORT Port, PUCHAR Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_INSW_PROC)(USHORT Port, PUSHORT Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_INSD_PROC)(USHORT Port, PULONG Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_OUTB_PROC)(ULONG Port, UCHAR Data); -typedef VOID (WINAPI *EMULATOR_OUTW_PROC)(ULONG Port, USHORT Data); -typedef VOID (WINAPI *EMULATOR_OUTD_PROC)(ULONG Port, ULONG Data); +typedef VOID (WINAPI *EMULATOR_OUTB_PROC)(USHORT Port, UCHAR Data); +typedef VOID (WINAPI *EMULATOR_OUTW_PROC)(USHORT Port, USHORT Data); +typedef VOID (WINAPI *EMULATOR_OUTD_PROC)(USHORT Port, ULONG Data); -typedef VOID (WINAPI *EMULATOR_OUTSB_PROC)(ULONG Port, PUCHAR Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_OUTSW_PROC)(ULONG Port, PUSHORT Buffer, ULONG Count); -typedef VOID (WINAPI *EMULATOR_OUTSD_PROC)(ULONG Port, PULONG Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_OUTSB_PROC)(USHORT Port, PUCHAR Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_OUTSW_PROC)(USHORT Port, PUSHORT Buffer, ULONG Count); +typedef VOID (WINAPI *EMULATOR_OUTSD_PROC)(USHORT Port, PULONG Buffer, ULONG Count); UCHAR -IOReadB(ULONG Port); +IOReadB(USHORT Port); VOID -IOReadStrB(ULONG Port, +IOReadStrB(USHORT Port, PUCHAR Buffer, ULONG Count); VOID -IOWriteB(ULONG Port, +IOWriteB(USHORT Port, UCHAR Buffer); VOID -IOWriteStrB(ULONG Port, +IOWriteStrB(USHORT Port, PUCHAR Buffer, ULONG Count); USHORT -IOReadW(ULONG Port); +IOReadW(USHORT Port); VOID -IOReadStrW(ULONG Port, +IOReadStrW(USHORT Port, PUSHORT Buffer, ULONG Count); VOID -IOWriteW(ULONG Port, +IOWriteW(USHORT Port, USHORT Buffer); VOID -IOWriteStrW(ULONG Port, +IOWriteStrW(USHORT Port, PUSHORT Buffer, ULONG Count); ULONG -IOReadD(ULONG Port); +IOReadD(USHORT Port); VOID -IOReadStrD(ULONG Port, +IOReadStrD(USHORT Port, PULONG Buffer, ULONG Count); VOID -IOWriteD(ULONG Port, +IOWriteD(USHORT Port, ULONG Buffer); VOID -IOWriteStrD(ULONG Port, +IOWriteStrD(USHORT Port, PULONG Buffer, ULONG Count); -VOID RegisterIoPort(ULONG Port, +VOID RegisterIoPort(USHORT Port, EMULATOR_INB_PROC InHandler, EMULATOR_OUTB_PROC OutHandler); -VOID UnregisterIoPort(ULONG Port); +VOID UnregisterIoPort(USHORT Port); VOID WINAPI EmulatorReadIo ( PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize @@ -97,7 +97,7 @@ VOID WINAPI EmulatorWriteIo ( PFAST486_STATE State, - ULONG Port, + USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize

1 0

[jgardou] 64916: [USER32_APITEST] - Add a test showing that CopyImage accepts LR_SHARED flag. CORE-7575
by jgardou＠svn.reactos.org 23 Oct '14

23 Oct '14

Author: jgardou Date: Thu Oct 23 11:19:21 2014 New Revision: 64916 URL: http://svn.reactos.org/svn/reactos?rev=64916&view=rev Log: [USER32_APITEST] - Add a test showing that CopyImage accepts LR_SHARED flag. CORE-7575 Modified: trunk/rostests/apitests/user32/LoadImage.c Modified: trunk/rostests/apitests/user32/LoadImage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/LoadImage… ============================================================================== --- trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] Thu Oct 23 11:19:21 2014 @@ -39,11 +39,27 @@ hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, 0); ok(hCopy != NULL, "\n"); ok(DestroyIcon(hCopy), "\n"); + /* Unlike the original, this one is not shared */ + ok(!DestroyIcon(hCopy), "\n"); hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, LR_COPYFROMRESOURCE); ok(hCopy != NULL, "\n"); ok(DestroyIcon(hCopy), "\n"); + /* Unlike the original, this one is not shared */ + ok(!DestroyIcon(hCopy), "\n"); + + hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, LR_COPYFROMRESOURCE | LR_SHARED); + ok(hCopy != NULL, "\n"); + ok(DestroyIcon(hCopy), "\n"); + /* This one is shared */ + ok(DestroyIcon(hCopy), "\n"); + hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, LR_SHARED); + ok(hCopy != NULL, "\n"); + ok(DestroyIcon(hCopy), "\n"); + /* This one is shared */ + ok(DestroyIcon(hCopy), "\n"); + /* Try various usual functions */ hdcScreen = CreateDCW(L"DISPLAY", NULL, NULL, NULL); ok(hdcScreen != NULL, "\n");

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