Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[ekohl] 69497: [INTL] Update date and time examples according to the current settings. CORE-10074
by ekohl＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: ekohl Date: Sun Oct 11 15:21:25 2015 New Revision: 69497 URL: http://svn.reactos.org/svn/reactos?rev=69497&view=rev Log: [INTL] Update date and time examples according to the current settings. CORE-10074 Modified: trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/time.c Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=69… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] Sun Oct 11 15:21:25 2015 @@ -503,13 +503,15 @@ WCHAR OutBuffer[MAX_SAMPLES_STR_SIZE]; /* Get short date format sample */ - GetDateFormatW(pGlobalData->UserLCID, DATE_SHORTDATE, NULL, NULL, OutBuffer, + GetDateFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szShortDateFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_SHRTDATESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); /* Get long date sample */ - GetDateFormatW(pGlobalData->UserLCID, DATE_LONGDATE, NULL, NULL, OutBuffer, + GetDateFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szLongDateFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_LONGDATESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sun Oct 11 15:21:25 2015 @@ -127,20 +127,23 @@ ZeroMemory(OutBuffer, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); /* Get time format sample */ - GetTimeFormatW(pGlobalData->UserLCID, NO_FLAG, NULL, NULL, + GetTimeFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szTimeFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_TIMESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); ZeroMemory(OutBuffer, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); /* Get short date format sample */ - GetDateFormatW(pGlobalData->UserLCID, DATE_SHORTDATE, NULL, NULL, + GetDateFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szShortDateFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_SHORTTIMESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); /* Get long date sample */ - GetDateFormatW(pGlobalData->UserLCID, DATE_LONGDATE, NULL, NULL, + GetDateFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szLongDateFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_FULLTIMESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=69… ============================================================================== --- trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] Sun Oct 11 15:21:25 2015 @@ -41,9 +41,11 @@ static VOID UpdateTimeSample(HWND hWnd, PGLOBALDATA pGlobalData) { - WCHAR szBuffer[80]; - - GetTimeFormatW(pGlobalData->UserLCID, 0, NULL, pGlobalData->szTimeFormat, szBuffer, 80); + WCHAR szBuffer[MAX_SAMPLES_STR_SIZE]; + + GetTimeFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szTimeFormat, szBuffer, + MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hWnd, IDC_TIMESAMPLE, WM_SETTEXT, 0, (LPARAM)szBuffer); }

1 0

[sginsberg] 69496: [NTOS] Follow up to r69075: Assert IRQL correctly in KeDisconnectInterrupt too (do not assume debug build means MP build).
by sginsberg＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: sginsberg Date: Sun Oct 11 13:18:30 2015 New Revision: 69496 URL: http://svn.reactos.org/svn/reactos?rev=69496&view=rev Log: [NTOS] Follow up to r69075: Assert IRQL correctly in KeDisconnectInterrupt too (do not assume debug build means MP build). Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Sun Oct 11 13:18:30 2015 @@ -454,10 +454,8 @@ */ #if defined(CONFIG_SMP) ASSERT(Irql <= SYNCH_LEVEL); -#elif (NTDDI_VERSION >= NTDDI_WS03) +#else ASSERT(Irql <= (IPI_LEVEL - 2)); -#else - ASSERT(Irql <= (IPI_LEVEL - 1)); #endif /* Check if this is the first chain */ @@ -526,7 +524,11 @@ if (Dispatch.Type == ChainConnect) { /* Check if the top-level interrupt is being removed */ +#if defined(CONFIG_SMP) ASSERT(Irql <= SYNCH_LEVEL); +#else + ASSERT(Irql <= (IPI_LEVEL - 2)); +#endif if (Interrupt == Dispatch.Interrupt) { /* Get the next one */

1 0

[tfaber] 69495: [PORTCLS] - Don't attempt broken pointer magic on power states
by tfaber＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: tfaber Date: Sun Oct 11 08:19:18 2015 New Revision: 69495 URL: http://svn.reactos.org/svn/reactos?rev=69495&view=rev Log: [PORTCLS] - Don't attempt broken pointer magic on power states Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Sun Oct 11 08:19:18 2015 @@ -112,7 +112,7 @@ DeviceExt->SystemPowerState = PowerSystemWorking; // notify power manager of current state - PowerState = *((POWER_STATE*)&DeviceExt->DevicePowerState); + PowerState.DeviceState = DeviceExt->DevicePowerState; PoSetPowerState(DeviceObject, DevicePowerState, PowerState); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -271,7 +271,7 @@ if (DeviceExtension->AdapterPowerManagement) { // it is query if the change can be changed - PowerState = *((POWER_STATE*)&IoStack->Parameters.Power.State.DeviceState); + PowerState = IoStack->Parameters.Power.State; Status = DeviceExtension->AdapterPowerManagement->QueryPowerChangeState(PowerState); // sanity check @@ -294,7 +294,7 @@ else { // set power state - PowerState = *((POWER_STATE*)&IoStack->Parameters.Power.State.DeviceState); + PowerState = IoStack->Parameters.Power.State; PoSetPowerState(DeviceObject, DevicePowerState, PowerState); // check if there is a registered adapter power management @@ -307,7 +307,7 @@ // FIXME call all registered IPowerNotify interfaces via ISubdevice interface // store new power state - DeviceExtension->DevicePowerState = IoStack->Parameters.Power.State.DeviceState; + DeviceExtension->DevicePowerState = IoStack->Parameters.Power.State.DeviceState; // complete request Irp->IoStatus.Status = Status; @@ -348,7 +348,7 @@ PwrContext->DeviceObject = DeviceObject; // pass the irp down - PowerState = *((POWER_STATE*)IoStack->Parameters.Power.State.SystemState); + PowerState = IoStack->Parameters.Power.State; Status = PoRequestPowerIrp(DeviceExtension->PhysicalDeviceObject, IoStack->MinorFunction, PowerState, PwrCompletionFunction, (PVOID)PwrContext, NULL); // check for success

1 0

[tfaber] 69494: [WIN32K] - Separate system-defined from user-defined window properties. The values stored by win32k/user32 must not interfere with those stored by applications. Fixes various applic...
by tfaber＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: tfaber Date: Sat Oct 10 19:50:05 2015 New Revision: 69494 URL: http://svn.reactos.org/svn/reactos?rev=69494&view=rev Log: [WIN32K] - Separate system-defined from user-defined window properties. The values stored by win32k/user32 must not interfere with those stored by applications. Fixes various applications (e.g. PeaZip) randomly getting their window properties overwritten by the system CORE-3897 #resolve Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/dde.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/layered.c trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/prop.c trunk/reactos/win32ss/user/ntuser/prop.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/windc.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/prop.c Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engwindow.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -104,7 +104,7 @@ ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); - Clip = UserGetProp(Window, AtomWndObj); + Clip = UserGetProp(Window, AtomWndObj, TRUE); if (!Clip) { return; @@ -208,7 +208,7 @@ Clip->PixelFormat = iPixelFormat; /* associate object with window */ - UserSetProp(Window, AtomWndObj, Clip); + UserSetProp(Window, AtomWndObj, Clip, TRUE); ++gcountPWO; TRACE("EngCreateWnd: SUCCESS: %p!\n", WndObjUser); @@ -253,7 +253,7 @@ else { /* Remove object from window */ - UserRemoveProp(Window, AtomWndObj); + UserRemoveProp(Window, AtomWndObj, TRUE); } --gcountPWO; Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -1028,6 +1028,8 @@ ATOM Atom; HANDLE Data; } PROPLISTITEM, *PPROPLISTITEM; + +#define PROPERTY_FLAG_SYSTEM 1 typedef struct _PROPERTY { Modified: trunk/reactos/win32ss/user/ntuser/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -339,7 +339,7 @@ if (pMsg->message == WM_DDE_TERMINATE) { - pddeProp = (PDDE_PROP)UserGetProp(pWnd, AtomDDETrack); + pddeProp = (PDDE_PROP)UserGetProp(pWnd, AtomDDETrack, TRUE); if (pddeProp) { pWndClient = UserGetWindowObject((HWND)pMsg->wParam); @@ -348,7 +348,7 @@ ERR("DDE Get Client WM_DDE_TERMINATE\n"); } - UserRemoveProp(pWnd, AtomDDETrack); + UserRemoveProp(pWnd, AtomDDETrack, TRUE); ExFreePoolWithTag(pddeProp, USERTAG_DDE1); } return TRUE; @@ -419,7 +419,7 @@ pddeProp->spwnd = pWndServer; pddeProp->spwndPartner = pWnd; - UserSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp); + UserSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp, TRUE); } return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -441,8 +441,8 @@ EngSetLastError(ERROR_INVALID_PARAMETER); return 0; } - hIconSmall = UserGetProp(pWnd, gpsi->atomIconSmProp); - hIcon = UserGetProp(pWnd, gpsi->atomIconProp); + hIconSmall = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE); + hIcon = UserGetProp(pWnd, gpsi->atomIconProp, TRUE); hIconOld = wParam == ICON_BIG ? hIcon : hIconSmall; @@ -460,8 +460,8 @@ break; } - UserSetProp(pWnd, gpsi->atomIconProp, hIcon); - UserSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall); + UserSetProp(pWnd, gpsi->atomIconProp, hIcon, TRUE); + UserSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall, TRUE); if ((pWnd->style & WS_CAPTION ) == WS_CAPTION) UserPaintCaption(pWnd, DC_ICON); @@ -481,11 +481,11 @@ switch(wParam) { case ICON_BIG: - hIconRet = UserGetProp(pWnd, gpsi->atomIconProp); + hIconRet = UserGetProp(pWnd, gpsi->atomIconProp, TRUE); break; case ICON_SMALL: case ICON_SMALL2: - hIconRet = UserGetProp(pWnd, gpsi->atomIconSmProp); + hIconRet = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE); break; default: break; Modified: trunk/reactos/win32ss/user/ntuser/layered.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/layere… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -22,7 +22,7 @@ BOOL FASTCALL GetLayeredStatus(PWND pWnd) { - PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer); + PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer, TRUE); if (pLrdProp) { return pLrdProp->is_Layered; @@ -33,7 +33,7 @@ BOOL FASTCALL SetLayeredStatus(PWND pWnd, BYTE set) { - PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer); + PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer, TRUE); if (pLrdProp) { pLrdProp->is_Layered = set; @@ -57,7 +57,7 @@ return FALSE; } - pLrdProp = UserGetProp(pWnd, AtomLayer); + pLrdProp = UserGetProp(pWnd, AtomLayer, TRUE); if (!pLrdProp) { @@ -68,7 +68,7 @@ return FALSE; } RtlZeroMemory(pLrdProp, sizeof(LRD_PROP)); - UserSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp); + UserSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp, TRUE); } if (pLrdProp) @@ -258,7 +258,7 @@ goto Exit; } - pLrdProp = UserGetProp(pWnd, AtomLayer); + pLrdProp = UserGetProp(pWnd, AtomLayer, TRUE); if (!pLrdProp) { Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -606,8 +606,8 @@ //FIXME: This is bad and we should feel bad. //FIXME: Stop whining over wine code. - hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp); - if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp); + hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE); + if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp, TRUE); if (!hIcon && pWnd->pcls->spicnSm) return pWnd->pcls->spicnSm; Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -1189,7 +1189,7 @@ ASSERT(pfwi); - FlashState = (DWORD)UserGetProp(pWnd, AtomFlashWndState); + FlashState = (DWORD)UserGetProp(pWnd, AtomFlashWndState, TRUE); if (FlashState == FLASHW_FINISHED) { @@ -1267,7 +1267,7 @@ IntKillTimer(pWnd, ID_EVENT_SYSTIMER_FLASHWIN, TRUE); } - UserRemoveProp(pWnd, AtomFlashWndState); + UserRemoveProp(pWnd, AtomFlashWndState, TRUE); } else { // Have a count and started, set timer. @@ -1305,7 +1305,7 @@ FlashState ^= (FlashState ^ pfwi->dwFlags) & (FLASHW_MASK & ~FLASHW_TIMER); } FlashState = MAKELONG(LOWORD(FlashState),uCount); - UserSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); + UserSetProp(pWnd, AtomFlashWndState, (HANDLE)FlashState, TRUE); } return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -15,11 +15,13 @@ FASTCALL IntGetProp( _In_ PWND Window, - _In_ ATOM Atom) + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp) { PLIST_ENTRY ListEntry; PPROPERTY Property; UINT i; + WORD SystemFlag = SystemProp ? PROPERTY_FLAG_SYSTEM : 0; NT_ASSERT(UserIsEntered()); ListEntry = Window->PropListHead.Flink; @@ -27,33 +29,29 @@ for (i = 0; i < Window->PropListItems; i++) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - - if (ListEntry == NULL) - { - ERR("Corrupted (or uninitialized?) property list for window %p. Prop count %u. Atom %u.\n", - Window, Window->PropListItems, Atom); - return NULL; - } - - if (Property->Atom == Atom) - { - return(Property); - } ListEntry = ListEntry->Flink; - } - return(NULL); + + if (Property->Atom == Atom && + (Property->fs & PROPERTY_FLAG_SYSTEM) == SystemFlag) + { + return Property; + } + } + NT_ASSERT(ListEntry == &Window->PropListHead); + return NULL; } HANDLE FASTCALL UserGetProp( _In_ PWND Window, - _In_ ATOM Atom) + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp) { PPROPERTY Prop; NT_ASSERT(UserIsEntered()); - Prop = IntGetProp(Window, Atom); + Prop = IntGetProp(Window, Atom, SystemProp); return Prop ? Prop->Data : NULL; } @@ -62,13 +60,14 @@ FASTCALL UserRemoveProp( _In_ PWND Window, - _In_ ATOM Atom) + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp) { PPROPERTY Prop; HANDLE Data; NT_ASSERT(UserIsEnteredExclusive()); - Prop = IntGetProp(Window, Atom); + Prop = IntGetProp(Window, Atom, SystemProp); if (Prop == NULL) { return NULL; @@ -87,12 +86,13 @@ UserSetProp( _In_ PWND Window, _In_ ATOM Atom, - _In_ HANDLE Data) + _In_ HANDLE Data, + _In_ BOOLEAN SystemProp) { PPROPERTY Prop; NT_ASSERT(UserIsEnteredExclusive()); - Prop = IntGetProp(Window, Atom); + Prop = IntGetProp(Window, Atom, SystemProp); if (Prop == NULL) { Prop = UserHeapAlloc(sizeof(PROPERTY)); @@ -101,6 +101,7 @@ return FALSE; } Prop->Atom = Atom; + Prop->fs = SystemProp ? PROPERTY_FLAG_SYSTEM : 0; InsertTailList(&Window->PropListHead, &Prop->PropListEntry); Window->PropListItems++; } @@ -171,24 +172,28 @@ (ListEntry != &Window->PropListHead)) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - listitem.Atom = Property->Atom; - listitem.Data = Property->Data; - - Status = MmCopyToCaller(li, &listitem, sizeof(PROPLISTITEM)); - if (!NT_SUCCESS(Status)) + ListEntry = ListEntry->Flink; + if (!(Property->fs & PROPERTY_FLAG_SYSTEM)) { - goto Exit; + listitem.Atom = Property->Atom; + listitem.Data = Property->Data; + + Status = MmCopyToCaller(li, &listitem, sizeof(PROPLISTITEM)); + if (!NT_SUCCESS(Status)) + { + goto Exit; + } + + BufferSize -= sizeof(PROPLISTITEM); + Cnt++; + li++; } - - BufferSize -= sizeof(PROPLISTITEM); - Cnt++; - li++; - ListEntry = ListEntry->Flink; } } else { + /* FIXME: This counts user and system props */ Cnt = Window->PropListItems * sizeof(PROPLISTITEM); } @@ -228,7 +233,7 @@ goto Exit; } - Data = UserRemoveProp(Window, Atom); + Data = UserRemoveProp(Window, Atom, FALSE); Exit: TRACE("Leave NtUserRemoveProp, ret=%p\n", Data); @@ -257,7 +262,7 @@ goto Exit; } - Ret = UserSetProp(Window, Atom, Data); + Ret = UserSetProp(Window, Atom, Data, FALSE); Exit: TRACE("Leave NtUserSetProp, ret=%i\n", Ret); Modified: trunk/reactos/win32ss/user/ntuser/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -4,13 +4,15 @@ FASTCALL UserGetProp( _In_ PWND Window, - _In_ ATOM Atom); + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp); HANDLE FASTCALL UserRemoveProp( _In_ PWND Window, - _In_ ATOM Atom); + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp); _Success_(return) BOOL @@ -18,7 +20,8 @@ UserSetProp( _In_ PWND Window, _In_ ATOM Atom, - _In_ HANDLE Data); + _In_ HANDLE Data, + _In_ BOOLEAN SystemProp); VOID FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -610,7 +610,7 @@ return 0; } - HelpId = (DWORD)(DWORD_PTR)UserGetProp(Window, gpsi->atomContextHelpIdProp); + HelpId = (DWORD)(DWORD_PTR)UserGetProp(Window, gpsi->atomContextHelpIdProp, TRUE); UserLeave(); return HelpId; @@ -666,9 +666,9 @@ } if ( Param ) - UserSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param); + UserSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param, TRUE); else - UserRemoveProp(Window, gpsi->atomContextHelpIdProp); + UserRemoveProp(Window, gpsi->atomContextHelpIdProp, TRUE); UserLeave(); return TRUE; Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -967,7 +967,7 @@ if (hWnd && (Wnd = UserGetWindowObject(hWnd))) { - Clip = (XCLIPOBJ*)UserGetProp(Wnd, AtomWndObj); + Clip = (XCLIPOBJ*)UserGetProp(Wnd, AtomWndObj, TRUE); if ( Clip && Clip->Hwnd == hWnd ) { 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] Sat Oct 10 19:50:05 2015 @@ -373,7 +373,7 @@ do { - HelpId = (DWORD)(DWORD_PTR)UserGetProp(pWnd, gpsi->atomContextHelpIdProp); + HelpId = (DWORD)(DWORD_PTR)UserGetProp(pWnd, gpsi->atomContextHelpIdProp, TRUE); if (!HelpId) break; pWnd = IntGetParent(pWnd); } Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -133,7 +133,7 @@ HWND* WIN_ListChildren (HWND hWndparent); VOID DeleteFrameBrushes(VOID); BOOL WINAPI GdiValidateHandle(HGDIOBJ); -HANDLE FASTCALL UserGetProp(HWND hWnd, ATOM Atom); +HANDLE FASTCALL UserGetProp(HWND hWnd, ATOM Atom, BOOLEAN SystemProp); BOOL WINAPI InitializeImmEntryTable(VOID); /* EOF */ Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -397,11 +397,11 @@ switch(wParam) { case ICON_BIG: - hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp); + hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp, TRUE); break; case ICON_SMALL: case ICON_SMALL2: - hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp); + hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp, TRUE); break; default: break; Modified: trunk/reactos/win32ss/user/user32/windows/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/prop.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -35,12 +35,13 @@ HANDLE FASTCALL -IntGetProp(HWND hWnd, ATOM Atom) +IntGetProp(HWND hWnd, ATOM Atom, BOOLEAN SystemProp) { PLIST_ENTRY ListEntry, temp; PPROPERTY Property; PWND pWnd; int i; + WORD SystemFlag = SystemProp ? PROPERTY_FLAG_SYSTEM : 0; pWnd = ValidateHwnd(hWnd); if (!pWnd) return NULL; @@ -49,7 +50,8 @@ for (i = 0; i < pWnd->PropListItems; i++ ) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - if (Property->Atom == Atom) + if (Property->Atom == Atom && + (Property->fs & PROPERTY_FLAG_SYSTEM) == SystemFlag) { return(Property); } @@ -61,10 +63,10 @@ HANDLE FASTCALL -UserGetProp(HWND hWnd, ATOM Atom) +UserGetProp(HWND hWnd, ATOM Atom, BOOLEAN SystemProp) { PPROPERTY Prop; - Prop = IntGetProp(hWnd, Atom); + Prop = IntGetProp(hWnd, Atom, SystemProp); return Prop ? Prop->Data : NULL; } @@ -383,7 +385,7 @@ { Atom = LOWORD((DWORD_PTR)lpString); } - Prop = IntGetProp(hWnd, Atom); + Prop = IntGetProp(hWnd, Atom, FALSE); if (Prop != NULL) Data = Prop->Data; return Data; }

1 0

[tfaber] 69493: [WIN32K] - Rename IntSetProp to UserSetProp, IntRemoveProp to UserRemoveProp and IntRemoveWindowProp to UserRemoveWindowProps
by tfaber＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: tfaber Date: Sat Oct 10 17:56:09 2015 New Revision: 69493 URL: http://svn.reactos.org/svn/reactos?rev=69493&view=rev Log: [WIN32K] - Rename IntSetProp to UserSetProp, IntRemoveProp to UserRemoveProp and IntRemoveWindowProp to UserRemoveWindowProps Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c trunk/reactos/win32ss/user/ntuser/dde.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/layered.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/prop.c trunk/reactos/win32ss/user/ntuser/prop.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engwindow.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -208,7 +208,7 @@ Clip->PixelFormat = iPixelFormat; /* associate object with window */ - IntSetProp(Window, AtomWndObj, Clip); + UserSetProp(Window, AtomWndObj, Clip); ++gcountPWO; TRACE("EngCreateWnd: SUCCESS: %p!\n", WndObjUser); @@ -253,7 +253,7 @@ else { /* Remove object from window */ - IntRemoveProp(Window, AtomWndObj); + UserRemoveProp(Window, AtomWndObj); } --gcountPWO; Modified: trunk/reactos/win32ss/user/ntuser/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -348,7 +348,7 @@ ERR("DDE Get Client WM_DDE_TERMINATE\n"); } - IntRemoveProp(pWnd, AtomDDETrack); + UserRemoveProp(pWnd, AtomDDETrack); ExFreePoolWithTag(pddeProp, USERTAG_DDE1); } return TRUE; @@ -419,7 +419,7 @@ pddeProp->spwnd = pWndServer; pddeProp->spwndPartner = pWnd; - IntSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp); + UserSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp); } return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -460,8 +460,8 @@ break; } - IntSetProp(pWnd, gpsi->atomIconProp, hIcon); - IntSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall); + UserSetProp(pWnd, gpsi->atomIconProp, hIcon); + UserSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall); if ((pWnd->style & WS_CAPTION ) == WS_CAPTION) UserPaintCaption(pWnd, DC_ICON); Modified: trunk/reactos/win32ss/user/ntuser/layered.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/layere… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -68,7 +68,7 @@ return FALSE; } RtlZeroMemory(pLrdProp, sizeof(LRD_PROP)); - IntSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp); + UserSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp); } if (pLrdProp) Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -1267,7 +1267,7 @@ IntKillTimer(pWnd, ID_EVENT_SYSTIMER_FLASHWIN, TRUE); } - IntRemoveProp(pWnd, AtomFlashWndState); + UserRemoveProp(pWnd, AtomFlashWndState); } else { // Have a count and started, set timer. @@ -1305,7 +1305,7 @@ FlashState ^= (FlashState ^ pfwi->dwFlags) & (FLASHW_MASK & ~FLASHW_TIMER); } FlashState = MAKELONG(LOWORD(FlashState),uCount); - IntSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); + UserSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); } return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -60,7 +60,7 @@ _Success_(return) HANDLE FASTCALL -IntRemoveProp( +UserRemoveProp( _In_ PWND Window, _In_ ATOM Atom) { @@ -84,7 +84,7 @@ _Success_(return) BOOL FASTCALL -IntSetProp( +UserSetProp( _In_ PWND Window, _In_ ATOM Atom, _In_ HANDLE Data) @@ -111,7 +111,7 @@ VOID FASTCALL -IntRemoveWindowProp( +UserRemoveWindowProps( _In_ PWND Window) { PLIST_ENTRY ListEntry; @@ -228,7 +228,7 @@ goto Exit; } - Data = IntRemoveProp(Window, Atom); + Data = UserRemoveProp(Window, Atom); Exit: TRACE("Leave NtUserRemoveProp, ret=%p\n", Data); @@ -257,7 +257,7 @@ goto Exit; } - Ret = IntSetProp(Window, Atom, Data); + Ret = UserSetProp(Window, Atom, Data); Exit: TRACE("Leave NtUserSetProp, ret=%i\n", Ret); Modified: trunk/reactos/win32ss/user/ntuser/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -8,19 +8,19 @@ HANDLE FASTCALL -IntRemoveProp( +UserRemoveProp( _In_ PWND Window, _In_ ATOM Atom); _Success_(return) BOOL FASTCALL -IntSetProp( +UserSetProp( _In_ PWND Window, _In_ ATOM Atom, _In_ HANDLE Data); VOID FASTCALL -IntRemoveWindowProp( +UserRemoveWindowProps( _In_ PWND Window); Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -666,9 +666,9 @@ } if ( Param ) - IntSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param); + UserSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param); else - IntRemoveProp(Window, gpsi->atomContextHelpIdProp); + UserRemoveProp(Window, gpsi->atomContextHelpIdProp); UserLeave(); return TRUE; 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] Sat Oct 10 17:56:09 2015 @@ -630,7 +630,7 @@ if (Window->PropListItems) { - IntRemoveWindowProp(Window); + UserRemoveWindowProps(Window); TRACE("Window->PropListItems %lu\n",Window->PropListItems); ASSERT(Window->PropListItems==0); }

1 0

[tfaber] 69492: [WIN32K:NTUSER] - Remove some unnecessary referencing in NtUserCallHwnd
by tfaber＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: tfaber Date: Sat Oct 10 17:46:57 2015 New Revision: 69492 URL: http://svn.reactos.org/svn/reactos?rev=69492&view=rev Log: [WIN32K:NTUSER] - Remove some unnecessary referencing in NtUserCallHwnd Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 10 17:46:57 2015 @@ -601,20 +601,17 @@ { PWND Window; DWORD HelpId; - USER_REFERENCE_ENTRY Ref; - - UserEnterExclusive(); + + UserEnterShared(); if (!(Window = UserGetWindowObject(hWnd))) { UserLeave(); return 0; } - UserRefObjectCo(Window, &Ref); HelpId = (DWORD)(DWORD_PTR)UserGetProp(Window, gpsi->atomContextHelpIdProp); - UserDerefObjectCo(Window); UserLeave(); return HelpId; }

1 0

[tfaber] 69491: [WIN32K:NTUSER] - Don't call IntGetProp from outside prop.c
by tfaber＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: tfaber Date: Sat Oct 10 16:43:47 2015 New Revision: 69491 URL: http://svn.reactos.org/svn/reactos?rev=69491&view=rev Log: [WIN32K:NTUSER] - Don't call IntGetProp from outside prop.c Modified: trunk/reactos/win32ss/user/ntuser/prop.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/windc.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] Sat Oct 10 16:43:47 2015 @@ -1,10 +1,4 @@ #pragma once - -PPROPERTY -FASTCALL -IntGetProp( - _In_ PWND Window, - _In_ ATOM Atom); HANDLE FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 10 16:43:47 2015 @@ -600,7 +600,7 @@ case HWND_ROUTINE_GETWNDCONTEXTHLPID: { PWND Window; - PPROPERTY HelpId; + DWORD HelpId; USER_REFERENCE_ENTRY Ref; UserEnterExclusive(); @@ -612,11 +612,11 @@ } UserRefObjectCo(Window, &Ref); - HelpId = IntGetProp(Window, gpsi->atomContextHelpIdProp); + HelpId = (DWORD)(DWORD_PTR)UserGetProp(Window, gpsi->atomContextHelpIdProp); UserDerefObjectCo(Window); UserLeave(); - return (DWORD)HelpId->Data; + return HelpId; } case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: if (IntIsWindow(hWnd)) Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Sat Oct 10 16:43:47 2015 @@ -962,15 +962,12 @@ XCLIPOBJ* Clip; PWND Wnd; HWND hWnd; - PPROPERTY pprop; hWnd = IntWindowFromDC(hdc); if (hWnd && (Wnd = UserGetWindowObject(hWnd))) { - pprop = IntGetProp(Wnd, AtomWndObj); - - Clip = (XCLIPOBJ*)pprop->Data; + Clip = (XCLIPOBJ*)UserGetProp(Wnd, AtomWndObj); if ( Clip && Clip->Hwnd == hWnd ) { 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] Sat Oct 10 16:43:47 2015 @@ -369,16 +369,16 @@ DWORD FASTCALL IntGetWindowContextHelpId( PWND pWnd ) { - PPROPERTY HelpId; + DWORD HelpId; do { - HelpId = IntGetProp(pWnd, gpsi->atomContextHelpIdProp); + HelpId = (DWORD)(DWORD_PTR)UserGetProp(pWnd, gpsi->atomContextHelpIdProp); if (!HelpId) break; pWnd = IntGetParent(pWnd); } while (pWnd && pWnd->fnid != FNID_DESKTOP); - return (DWORD) (HelpId ? HelpId->Data : 0 ); + return HelpId; } /***********************************************************************

1 0

[tfaber] 69490: [USER32_APITEST] - Add some tests for window properties CORE-3897
by tfaber＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: tfaber Date: Sat Oct 10 16:08:31 2015 New Revision: 69490 URL: http://svn.reactos.org/svn/reactos?rev=69490&view=rev Log: [USER32_APITEST] - Add some tests for window properties CORE-3897 Added: trunk/rostests/apitests/user32/SetProp.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Sat Oct 10 16:08:31 2015 @@ -27,6 +27,7 @@ SetActiveWindow.c SetCursorPos.c SetParent.c + SetProp.c SetScrollInfo.c SystemParametersInfo.c TrackMouseEvent.c Added: trunk/rostests/apitests/user32/SetProp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetProp.c… ============================================================================== --- trunk/rostests/apitests/user32/SetProp.c (added) +++ trunk/rostests/apitests/user32/SetProp.c [iso-8859-1] Sat Oct 10 16:08:31 2015 @@ -0,0 +1,177 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SetProp + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#include <winuser.h> +#include "helper.h" + +static ATOM Atom1, Atom2, Atom3; + +static +BOOL +CALLBACK +EnumFunc( + _In_ HWND hWnd, + _In_ PCWSTR lpszString, + _In_ HANDLE hData) +{ + if (HIWORD(lpszString)) + ok(0, "Unexpected EnumFunc call: %p, '%ls', %p\n", hWnd, lpszString, hData); + else + ok(0, "Unexpected EnumFunc call: %p, 0x%04x, %p\n", hWnd, (USHORT)(ULONG_PTR)lpszString, hData); + return TRUE; +} + +static +BOOL +CALLBACK +EnumFuncEx( + _In_ HWND hWnd, + _In_ PWSTR lpszString, + _In_ HANDLE hData, + _In_ ULONG_PTR dwData) +{ + if (dwData == 0) + { + if (HIWORD(lpszString)) + ok(0, "Unexpected EnumFuncEx call: %p, '%ls', %p\n", hWnd, lpszString, hData); + else + ok(0, "Unexpected EnumFuncEx call: %p, 0x%04x, %p\n", hWnd, (USHORT)(ULONG_PTR)lpszString, hData); + } + else + { + if (HIWORD(lpszString)) + { + if (!wcscmp(lpszString, L"PropTestAtom1")) + ok(hData == &Atom1, "EnumFuncEx: %p, '%ls', %p; expected %p\n", hWnd, lpszString, hData, &Atom1); + else if (!wcscmp(lpszString, L"PropTestAtom2")) + ok(hData == &Atom2, "EnumFuncEx: %p, '%ls', %p; expected %p\n", hWnd, lpszString, hData, &Atom2); + else + ok(0, "Unexpected EnumFuncEx call: %p, '%ls', %p\n", hWnd, lpszString, hData); + } + else + ok(0, "Unexpected EnumFuncEx call: %p, 0x%04x, %p\n", hWnd, (USHORT)(ULONG_PTR)lpszString, hData); + } + return TRUE; +} + +START_TEST(SetProp) +{ + HWND hWnd; + MSG msg; + UINT Atom; + HANDLE Prop; + LRESULT Result; + ATOM SysICAtom; + ATOM SysICSAtom; + HICON hIcon; + HICON hIcon2; + + Atom1 = GlobalAddAtomW(L"PropTestAtom1"); + ok(Atom1 != 0, "PropTestAtom1 is 0x%04x\n", Atom1); + ok(Atom1 >= 0xc000, "PropTestAtom1 is 0x%04x\n", Atom1); + ok(Atom1 >= 0xc018, "PropTestAtom1 is 0x%04x\n", Atom1); + + /* These are not in the global atom table */ + Atom = GlobalFindAtomW(L"SysIC"); + ok(Atom == 0, "SysIC atom is 0x%04x\n", Atom); + Atom = GlobalFindAtomW(L"SysICS"); + ok(Atom == 0, "SysICS atom is 0x%04x\n", Atom); + + SetCursorPos(0, 0); + + RegisterSimpleClass(DefWindowProcW, L"PropTest"); + + hWnd = CreateWindowExW(0, L"PropTest", NULL, 0, 10, 10, 20, 20, NULL, NULL, 0, NULL); + + Result = EnumPropsW(hWnd, EnumFunc); + if (0) // Windows returns an uninitialized value here + ok(Result == TRUE, "EnumProps returned %Iu\n", Result); + Result = EnumPropsExW(hWnd, EnumFuncEx, 0); + if (0) // Windows returns an uninitialized value here + ok(Result == TRUE, "EnumPropsEx returned %Iu\n", Result); + + Atom2 = GlobalAddAtomW(L"PropTestAtom2"); + ok(Atom2 != 0, "PropTestAtom2 is 0x%04x\n", Atom2); + ok(Atom2 >= 0xc000, "PropTestAtom2 is 0x%04x\n", Atom2); + ok(Atom2 >= 0xc018, "PropTestAtom2 is 0x%04x\n", Atom2); + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + + Result = EnumPropsExW(hWnd, EnumFuncEx, 0); + if (0) // Windows returns an uninitialized value here + ok(Result == TRUE, "EnumPropsEx returned %Iu\n", Result); + + Result = SetPropW(hWnd, (PCWSTR)MAKEINTATOM(Atom1), &Atom1); + ok(Result == TRUE, "SetProp returned %Iu\n", Result); + Result = SetPropW(hWnd, (PCWSTR)MAKEINTATOM(Atom2), &Atom3); + ok(Result == TRUE, "SetProp returned %Iu\n", Result); + Prop = GetPropW(hWnd, (PCWSTR)MAKEINTATOM(Atom2)); + ok(Prop == &Atom3, "GetProp returned %p, expected %p\n", Prop, &Atom3); + Result = SetPropW(hWnd, (PCWSTR)MAKEINTATOM(Atom2), &Atom2); + ok(Result == TRUE, "SetProp returned %Iu\n", Result); + Prop = GetPropW(hWnd, (PCWSTR)MAKEINTATOM(Atom2)); + ok(Prop == &Atom2, "GetProp returned %p, expected %p\n", Prop, &Atom2); + Prop = GetPropW(hWnd, L"PropTestAtom2"); + ok(Prop == &Atom2, "GetProp returned %p, expected %p\n", Prop, &Atom2); + Prop = GetPropA(hWnd, "PropTestAtom2"); + ok(Prop == &Atom2, "GetProp returned %p, expected %p\n", Prop, &Atom2); + + Result = EnumPropsExW(hWnd, EnumFuncEx, 1); + ok(Result == TRUE, "EnumPropsEx returned %Iu\n", Result); + + hIcon = LoadImageW(NULL, (PCWSTR)MAKEINTRESOURCE(OIC_NOTE), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED); + ok(hIcon != NULL, "LoadImage failed with %lu\n", GetLastError()); + /* Should not have any icon */ + hIcon2 = (HICON)SendMessageW(hWnd, WM_GETICON, ICON_BIG, 0); + ok(hIcon2 == NULL, "WM_GETICON returned %p, expected NULL\n", hIcon2); + hIcon2 = (HICON)SendMessageW(hWnd, WM_GETICON, ICON_SMALL, 0); + ok(hIcon2 == NULL, "WM_GETICON returned %p, expected NULL\n", hIcon2); + + /* Set big icon, should also set small icon */ + Result = SendMessageW(hWnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + ok(Result == 0, "WM_SETICON returned 0x%Ix\n", Result); + + hIcon2 = (HICON)SendMessageW(hWnd, WM_GETICON, ICON_BIG, 0); + ok(hIcon2 == hIcon, "WM_GETICON returned %p, expected %p\n", hIcon2, hIcon); + hIcon2 = (HICON)SendMessageW(hWnd, WM_GETICON, ICON_SMALL, 0); + ok(hIcon2 != hIcon && hIcon != NULL, "WM_GETICON returned %p, expected not %p and not NULL\n", hIcon2, hIcon); + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + + /* We should have only the props that we explicitly set */ + for (Atom = 0x0000; Atom <= 0xffff; Atom++) + { + Prop = GetPropW(hWnd, (PCWSTR)MAKEINTATOM(Atom)); + if (Atom == Atom1) + ok(Prop == &Atom1, "Window %p Prop 0x%04x = %p, expected %p\n", hWnd, Atom, Prop, &Atom1); + else if (Atom == Atom2) + ok(Prop == &Atom2, "Window %p Prop 0x%04x = %p, expected %p\n", hWnd, Atom, Prop, &Atom2); + else + ok(Prop == NULL, "Window %p Prop 0x%04x = %p\n", hWnd, Atom, Prop); + } + + /* In particular we shouldn't see these from WM_SETICON */ + SysICAtom = RegisterWindowMessageW(L"SysIC"); + Prop = GetPropW(hWnd, (PCWSTR)MAKEINTATOM(SysICAtom)); + ok(Prop == NULL, "SysIC prop (0x%04x) is %p\n", SysICAtom, Prop); + + SysICSAtom = RegisterWindowMessageW(L"SysICS"); + Prop = GetPropW(hWnd, (PCWSTR)MAKEINTATOM(SysICSAtom)); + ok(Prop == NULL, "SysICS prop (0x%04x) is %p\n", SysICSAtom, Prop); + + GlobalDeleteAtom(Atom1); + GlobalDeleteAtom(Atom2); + + DestroyWindow(hWnd); + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + } Propchange: trunk/rostests/apitests/user32/SetProp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Sat Oct 10 16:08:31 2015 @@ -29,6 +29,7 @@ extern void func_SetActiveWindow(void); extern void func_SetCursorPos(void); extern void func_SetParent(void); +extern void func_SetProp(void); extern void func_SetScrollInfo(void); extern void func_SystemParametersInfo(void); extern void func_TrackMouseEvent(void); @@ -63,6 +64,7 @@ { "SetActiveWindow", func_SetActiveWindow }, { "SetCursorPos", func_SetCursorPos }, { "SetParent", func_SetParent }, + { "SetProp", func_SetProp }, { "SetScrollInfo", func_SetScrollInfo }, { "SystemParametersInfo", func_SystemParametersInfo }, { "TrackMouseEvent", func_TrackMouseEvent },

1 0

[pschweitzer] 69489: [CSQ] Add even more sanity checks
by pschweitzer＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: pschweitzer Date: Sat Oct 10 14:52:19 2015 New Revision: 69489 URL: http://svn.reactos.org/svn/reactos?rev=69489&view=rev Log: [CSQ] Add even more sanity checks Modified: trunk/reactos/lib/drivers/csq/csq.c Modified: trunk/reactos/lib/drivers/csq/csq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/csq.c?rev=… ============================================================================== --- trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] Sat Oct 10 14:52:19 2015 @@ -337,6 +337,8 @@ if(!Irp) break; + ASSERT(Context->Csq == Csq); + /* Unset the cancel routine and see if it has already been canceled */ if(!IoSetCancelRoutine(Irp, NULL)) { @@ -348,6 +350,8 @@ break; } + ASSERT(Context == Irp->Tail.Overlay.DriverContext[3]); + /* This IRP is valid and is ours. Dequeue it, fix it up, and return */ Csq->CsqRemoveIrp(Csq, Irp); @@ -358,7 +362,7 @@ Context->Irp = NULL; ASSERT(Context->Csq == Csq); - } + } } while(0); @@ -412,8 +416,12 @@ /* Unset the context stuff and return */ Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); - if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) + if (Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) + { Context->Irp = NULL; + + ASSERT(Context->Csq == Csq); + } break; }

1 0

[tfaber] 69488: [WIN32K:NTUSER] - Make IntRemoveProp return the property value and use it from NtUserRemoveProp
by tfaber＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: tfaber Date: Sat Oct 10 14:43:25 2015 New Revision: 69488 URL: http://svn.reactos.org/svn/reactos?rev=69488&view=rev Log: [WIN32K:NTUSER] - Make IntRemoveProp return the property value and use it from NtUserRemoveProp Modified: trunk/reactos/win32ss/user/ntuser/prop.c trunk/reactos/win32ss/user/ntuser/prop.h Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Sat Oct 10 14:43:25 2015 @@ -58,25 +58,27 @@ } _Success_(return) -BOOL +HANDLE FASTCALL IntRemoveProp( _In_ PWND Window, _In_ ATOM Atom) { PPROPERTY Prop; + HANDLE Data; NT_ASSERT(UserIsEnteredExclusive()); Prop = IntGetProp(Window, Atom); if (Prop == NULL) { - return FALSE; - } - + return NULL; + } + + Data = Prop->Data; RemoveEntryList(&Prop->PropListEntry); UserHeapFree(Prop); Window->PropListItems--; - return TRUE; + return Data; } _Success_(return) @@ -215,7 +217,6 @@ _In_ ATOM Atom) { PWND Window; - PPROPERTY Prop; HANDLE Data = NULL; TRACE("Enter NtUserRemoveProp\n"); @@ -227,16 +228,7 @@ goto Exit; } - Prop = IntGetProp(Window, Atom); - if (Prop == NULL) - { - goto Exit; - } - - Data = Prop->Data; - RemoveEntryList(&Prop->PropListEntry); - UserHeapFree(Prop); - Window->PropListItems--; + Data = IntRemoveProp(Window, Atom); Exit: TRACE("Leave NtUserRemoveProp, ret=%p\n", Data); Modified: trunk/reactos/win32ss/user/ntuser/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] Sat Oct 10 14:43:25 2015 @@ -12,8 +12,7 @@ _In_ PWND Window, _In_ ATOM Atom); -_Success_(return) -BOOL +HANDLE FASTCALL IntRemoveProp( _In_ PWND Window,

1 0

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

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 October 2015