Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 62614: [EPSAPI] Fix double free in PsaCaptureSystemModules() CID #1106329
by pschweitzer＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: pschweitzer Date: Sat Apr 5 09:17:21 2014 New Revision: 62614 URL: http://svn.reactos.org/svn/reactos?rev=62614&view=rev Log: [EPSAPI] Fix double free in PsaCaptureSystemModules() CID #1106329 Modified: trunk/reactos/lib/epsapi/enum/drivers.c Modified: trunk/reactos/lib/epsapi/enum/drivers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/epsapi/enum/drivers.c?… ============================================================================== --- trunk/reactos/lib/epsapi/enum/drivers.c [iso-8859-1] (original) +++ trunk/reactos/lib/epsapi/enum/drivers.c [iso-8859-1] Sat Apr 5 09:17:21 2014 @@ -100,6 +100,7 @@ ignore the buffer's content at this point, there's no point in a realloc, that could end up copying a large chunk of data we'd discard anyway */ PsaiFree(psmModules); + psmModules = NULL; pTmp = PsaiMalloc(nSize); if(pTmp == NULL) @@ -138,7 +139,7 @@ } while(0); #endif /* in case of failure, free the buffer */ - if(!NT_SUCCESS(Status)) + if(!NT_SUCCESS(Status) && psmModules != NULL) { PsaiFree(psmModules); }

1 0

[jimtabor] 62613: [Win32k] - Fix wine win.c test_CreateWindow line 5470, pass all those tests.
by jimtabor＠svn.reactos.org 05 Apr '14

05 Apr '14

Author: jimtabor Date: Sat Apr 5 05:06:48 2014 New Revision: 62613 URL: http://svn.reactos.org/svn/reactos?rev=62613&view=rev Log: [Win32k] - Fix wine win.c test_CreateWindow line 5470, pass all those tests. Modified: trunk/reactos/win32ss/user/ntuser/window.c 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 Apr 5 05:06:48 2014 @@ -1353,7 +1353,7 @@ co_WinPosSetWindowPos( Wnd, (0 == (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOP : HWND_TOPMOST), pt.x, pt.y, 0, 0, swFlags); - //ERR("IntSetParent SetWindowPos 2\n"); + //ERR("IntSetParent SetWindowPos 2 X %d Y %d\n",pt.x, pt.y); if (WasVisible) co_WinPosShowWindow(Wnd, SW_SHOWNORMAL); return WndOldParent; @@ -1742,12 +1742,12 @@ /* Allocates and initializes a window */ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, - PLARGE_STRING WindowName, - PCLS Class, - PWND ParentWindow, - PWND OwnerWindow, - PVOID acbiBuffer, - PDESKTOP pdeskCreated) + PLARGE_STRING WindowName, + PCLS Class, + PWND ParentWindow, + PWND OwnerWindow, + PVOID acbiBuffer, + PDESKTOP pdeskCreated) { PWND pWnd = NULL; HWND hWnd; @@ -1759,8 +1759,8 @@ pti = pdeskCreated ? gptiDesktopThread : GetW32ThreadInfo(); if (!(Cs->dwExStyle & WS_EX_LAYOUTRTL)) - { - if (ParentWindow) + { // Need both here for wine win.c test_CreateWindow. + if (Cs->hwndParent && ParentWindow) { if ( (Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD && ParentWindow->ExStyle & WS_EX_LAYOUTRTL && @@ -1776,7 +1776,6 @@ */ if ( Class->fnid != FNID_DIALOG ) { - ERR("No parent and not a dialog Fix HACK\n"); if (pti->ppi->dwLayout & LAYOUT_RTL) { Cs->dwExStyle |= WS_EX_LAYOUTRTL; @@ -2115,10 +2114,7 @@ } /* Now find the parent and the owner window */ - /////////////// - // FIXME!!!! Breaks wine win.c test_CreateWindow line 5470! hWndParent = pti->rpdesk->pDeskInfo->spwnd->head.h; - /////////////// hWndOwner = NULL; if (Cs->hwndParent == HWND_MESSAGE)

1 0

[jimtabor] 62612: [Win32k] - Notify FIXME HACK Alert! Are we setting parent to early?
by jimtabor＠svn.reactos.org 04 Apr '14

04 Apr '14

Author: jimtabor Date: Fri Apr 4 17:52:23 2014 New Revision: 62612 URL: http://svn.reactos.org/svn/reactos?rev=62612&view=rev Log: [Win32k] - Notify FIXME HACK Alert! Are we setting parent to early? Modified: trunk/reactos/win32ss/user/ntuser/window.c 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] Fri Apr 4 17:52:23 2014 @@ -1776,6 +1776,7 @@ */ if ( Class->fnid != FNID_DIALOG ) { + ERR("No parent and not a dialog Fix HACK\n"); if (pti->ppi->dwLayout & LAYOUT_RTL) { Cs->dwExStyle |= WS_EX_LAYOUTRTL; @@ -2114,7 +2115,10 @@ } /* Now find the parent and the owner window */ + /////////////// + // FIXME!!!! Breaks wine win.c test_CreateWindow line 5470! hWndParent = pti->rpdesk->pDeskInfo->spwnd->head.h; + /////////////// hWndOwner = NULL; if (Cs->hwndParent == HWND_MESSAGE)

1 0

[jimtabor] 62611: [User32] - Add more to GetInsideRect NC. - Sync port from wine with modifications.
by jimtabor＠svn.reactos.org 04 Apr '14

04 Apr '14

Author: jimtabor Date: Fri Apr 4 14:59:19 2014 New Revision: 62611 URL: http://svn.reactos.org/svn/reactos?rev=62611&view=rev Log: [User32] - Add more to GetInsideRect NC. - Sync port from wine with modifications. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c 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] Fri Apr 4 14:59:19 2014 @@ -123,15 +123,13 @@ /* Remove frame from rectangle */ if (UserHasThickFrameStyle(Style, ExStyle )) { - InflateRect(rect, -GetSystemMetrics(SM_CXFRAME), - -GetSystemMetrics(SM_CYFRAME)); + InflateRect(rect, -GetSystemMetrics(SM_CXFRAME), -GetSystemMetrics(SM_CYFRAME)); } else { if (UserHasDlgFrameStyle(Style, ExStyle )) { - InflateRect(rect, -GetSystemMetrics(SM_CXDLGFRAME), - -GetSystemMetrics(SM_CYDLGFRAME)); + InflateRect(rect, -GetSystemMetrics(SM_CXDLGFRAME), -GetSystemMetrics(SM_CYDLGFRAME)); /* FIXME: this isn't in NC_AdjustRect? why not? */ if (ExStyle & WS_EX_DLGMODALFRAME) InflateRect( rect, -1, 0 ); @@ -140,10 +138,18 @@ { if (UserHasThinFrameStyle(Style, ExStyle)) { - InflateRect(rect, -GetSystemMetrics(SM_CXBORDER), - -GetSystemMetrics(SM_CYBORDER)); - } - } + InflateRect(rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER)); + } + } + } + /* We have additional border information if the window + * is a child (but not an MDI child) */ + if ((Style & WS_CHILD) && !(ExStyle & WS_EX_MDICHILD)) + { + if (ExStyle & WS_EX_CLIENTEDGE) + InflateRect (rect, -GetSystemMetrics(SM_CXEDGE), -GetSystemMetrics(SM_CYEDGE)); + if (ExStyle & WS_EX_STATICEDGE) + InflateRect (rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER)); } } @@ -1086,7 +1092,6 @@ ReleaseDC(hWnd, hdc2); CloseClipboard(); - }

1 0

[jimtabor] 62610: [User32] - Patch by Piotr Caban : Make it possible to activate a window with parent and no WS_CHILD flag in WS_NCLBUTTONDOWN function. - Sync port from wine with modifications and...
by jimtabor＠svn.reactos.org 04 Apr '14

04 Apr '14

Author: jimtabor Date: Fri Apr 4 14:49:22 2014 New Revision: 62610 URL: http://svn.reactos.org/svn/reactos?rev=62610&view=rev Log: [User32] - Patch by Piotr Caban : Make it possible to activate a window with parent and no WS_CHILD flag in WS_NCLBUTTONDOWN function. - Sync port from wine with modifications and addons. Modified: trunk/reactos/win32ss/user/user32/windows/nonclient.c Modified: trunk/reactos/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] Fri Apr 4 14:49:22 2014 @@ -980,26 +980,44 @@ LRESULT DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam) { + PWND Wnd = ValidateHwnd(hWnd); + switch (wParam) { case HTCAPTION: { - HWND hTopWnd = GetAncestor(hWnd, GA_ROOT); - if ( NtUserCallHwndLock(hTopWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE) || - GetActiveWindow() == hTopWnd) - { - SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOVE + HTCAPTION, lParam); - } - break; + HWND hTopWnd = hWnd, parent; + while(1) + { + if ((GetWindowLongW( hTopWnd, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) != WS_CHILD) + break; + parent = GetAncestor( hTopWnd, GA_PARENT ); + if (!parent || parent == GetDesktopWindow()) break; + hTopWnd = parent; + } + + if ( NtUserCallHwndLock(hTopWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE) || + GetActiveWindow() == hTopWnd) + { + SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOVE + HTCAPTION, lParam); + } + break; } case HTSYSMENU: { LONG style = GetWindowLongPtrW( hWnd, GWL_STYLE ); if (style & WS_SYSMENU) - { - SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, - lParam); - } + { + if( Wnd && !(style & WS_MINIMIZE) ) + { + RECT rect; + HDC hDC = GetWindowDC(hWnd); + UserGetInsideRectNC(Wnd, &rect); + UserDrawSysMenuButton(hWnd, hDC, &rect, TRUE); + ReleaseDC( hWnd, hDC ); + } + SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, lParam); + } break; } case HTMENU: @@ -1070,7 +1088,14 @@ } case HTSYSMENU: { - SendMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); + HMENU hSysMenu = GetSystemMenu(hWnd, FALSE); + UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); + + /* If the close item of the sysmenu is disabled or not present do nothing */ + if ((state & (MF_DISABLED | MF_GRAYED)) || (state == 0xFFFFFFFF)) + break; + + SendMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, lParam); break; } default:

1 0

[jimtabor] 62609: [User32] - Patch by Javier Cantero : Fix side effect in SubtractRect(). - Sync port from wine with modifications
by jimtabor＠svn.reactos.org 04 Apr '14

04 Apr '14

Author: jimtabor Date: Fri Apr 4 14:40:51 2014 New Revision: 62609 URL: http://svn.reactos.org/svn/reactos?rev=62609&view=rev Log: [User32] - Patch by Javier Cantero : Fix side effect in SubtractRect(). - Sync port from wine with modifications Modified: trunk/reactos/win32ss/user/user32/windows/rect.c Modified: trunk/reactos/win32ss/user/user32/windows/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] Fri Apr 4 14:40:51 2014 @@ -193,16 +193,20 @@ if(lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL) return(FALSE); - CopyRect(lprcDst, lprcSrc1); - if(!IntersectRect(&tempRect, lprcSrc1, lprcSrc2)) + { + *lprcDst = *lprcSrc1; return(TRUE); - - if (EqualRect(&tempRect, lprcDst)) + } + + if (EqualRect(&tempRect, lprcSrc1)) { SetRectEmpty(lprcDst); return FALSE; } + + *lprcDst = *lprcSrc1; + if(lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom) { if(lprcDst->left == tempRect.left)

1 0

[hbelusca] 62608: [ACPICA][ACPI] Finally... - Specify that we use MUTEXes instead of binary semaphores, - Change two interface names in our code: ACPI_DEVICE_ID_LIST --> ACPI_PNP_DEVICE_ID_LIST and...
by hbelusca＠svn.reactos.org 03 Apr '14

03 Apr '14

Author: hbelusca Date: Thu Apr 3 23:44:20 2014 New Revision: 62608 URL: http://svn.reactos.org/svn/reactos?rev=62608&view=rev Log: [ACPICA][ACPI] Finally... - Specify that we use MUTEXes instead of binary semaphores, - Change two interface names in our code: ACPI_DEVICE_ID_LIST --> ACPI_PNP_DEVICE_ID_LIST and acpi_device_id --> acpi_pnp_device_id (only those names were changed in ACPICA). - Implement AcpiOsPhysicalTableOverride which doesn't any table override (same behaviour as AcpiOsTableOverride). - Latest ACPICA versions introduce the AcpiOsWaitEventsComplete API, which is used to wait for all asynchronous events to complete. But we do nothing at the moment ("inspired" from the behaviour from http://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/sys/dev/acpi/acpica/Osd… , but I'm sure ReactOS ACPI specialists know better than me whether or not it is judicious to do so !!!) - Extend AcpiOsRead/WriteMemory to be able to read/write 64-bit values, as required by the ACPICA implementation. Fix the build. Now, only warnings from our code (not ACPICA) need to be fixed. Real HW testers, please retest your real HW with this revision (or above) !! CORE-8044 #comment Everything updated in revisions 62604 to 62608. Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/include/acpi_bus.h trunk/reactos/drivers/bus/acpi/osl.c Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h [iso-8859-1] Thu Apr 3 23:44:20 2014 @@ -290,7 +290,7 @@ /* Type of mutex supported by host. Default is binary semaphores. */ #ifndef ACPI_MUTEX_TYPE -#define ACPI_MUTEX_TYPE ACPI_BINARY_SEMAPHORE +#define ACPI_MUTEX_TYPE ACPI_OSL_MUTEX #endif /* Global Lock acquire/release */ Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Thu Apr 3 23:44:20 2014 @@ -827,7 +827,7 @@ goto Done; if (device->flags.compatible_ids) { - ACPI_DEVICE_ID_LIST *cid_list = device->pnp.cid_list; + ACPI_PNP_DEVICE_ID_LIST *cid_list = device->pnp.cid_list; int i; /* compare multiple _CID entries against driver ids */ @@ -1140,7 +1140,7 @@ ACPI_DEVICE_INFO *info; char *hid = NULL; char *uid = NULL; - ACPI_DEVICE_ID_LIST *cid_list = NULL; + ACPI_PNP_DEVICE_ID_LIST *cid_list = NULL; int i = 0; char static_uid_buffer[5]; Modified: trunk/reactos/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpi_bus.h [iso-8859-1] Thu Apr 3 23:44:20 2014 @@ -175,7 +175,7 @@ acpi_bus_id bus_id; /* Object name */ acpi_bus_address bus_address; /* _ADR */ acpi_hardware_id hardware_id; /* _HID */ - ACPI_DEVICE_ID_LIST *cid_list; /* _CIDs */ + ACPI_PNP_DEVICE_ID_LIST *cid_list; /* _CIDs */ acpi_unique_id unique_id; /* _UID */ acpi_device_name device_name; /* Driver-determined */ acpi_device_class device_class; /* " */ @@ -330,7 +330,7 @@ int acpi_bus_start(struct acpi_device *device); ACPI_STATUS acpi_bus_get_ejd(ACPI_HANDLE handle, ACPI_HANDLE * ejd); int acpi_match_device_ids(struct acpi_device *device, - const struct acpi_device_id *ids); + const struct acpi_pnp_device_id *ids); int acpi_bus_get_device(ACPI_HANDLE handle, struct acpi_device **device); int acpi_init(void); ACPI_STATUS acpi_suspend (UINT32 state); Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Thu Apr 3 23:44:20 2014 @@ -46,7 +46,7 @@ ACPI_PHYSICAL_ADDRESS pa = 0; DPRINT("AcpiOsGetRootPointer\n"); - + AcpiFindRootPointer(&pa); return pa; } @@ -64,7 +64,7 @@ /* No override */ *NewValue = NULL; - + return AE_OK; } @@ -81,7 +81,26 @@ /* No override */ *NewTable = NULL; - + + return AE_OK; +} + +ACPI_STATUS +AcpiOsPhysicalTableOverride( + ACPI_TABLE_HEADER *ExistingTable, + ACPI_PHYSICAL_ADDRESS *NewAddress, + UINT32 *NewTableLength) +{ + if (!ExistingTable || !NewAddress || !NewTableLength) + { + DPRINT1("Invalid parameter\n"); + return AE_BAD_PARAMETER; + } + + /* No override */ + *NewAddress = 0; + *NewTableLength = 0; + return AE_OK; } @@ -92,9 +111,9 @@ { PHYSICAL_ADDRESS Address; PVOID Ptr; - + DPRINT("AcpiOsMapMemory(phys 0x%p size 0x%X)\n", phys, length); - + ASSERT(phys); Address.QuadPart = (ULONG)phys; @@ -103,7 +122,7 @@ { DPRINT1("Mapping failed\n"); } - + return Ptr; } @@ -150,7 +169,7 @@ AcpiOsFree(void *ptr) { if (!ptr) - DPRINT1("Attempt to free null pointer!!!\n"); + DPRINT1("Attempt to free null pointer!!!\n"); ExFreePoolWithTag(ptr, 'IPCA'); } @@ -164,7 +183,6 @@ _SEH2_TRY { ProbeForRead(Memory, Length, sizeof(UCHAR)); - Ret = TRUE; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -172,7 +190,7 @@ Ret = FALSE; } _SEH2_END; - + return Ret; } @@ -186,7 +204,6 @@ _SEH2_TRY { ProbeForWrite(Memory, Length, sizeof(UCHAR)); - Ret = TRUE; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -194,7 +211,7 @@ Ret = FALSE; } _SEH2_END; - + return Ret; } @@ -215,14 +232,14 @@ OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; - DPRINT("AcpiOsExecute\n"); - - InitializeObjectAttributes(&ObjectAttributes, + DPRINT("AcpiOsExecute\n"); + + InitializeObjectAttributes(&ObjectAttributes, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); - + Status = PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, &ObjectAttributes, @@ -234,7 +251,7 @@ return AE_ERROR; ZwClose(ThreadHandle); - + return AE_OK; } @@ -242,7 +259,7 @@ AcpiOsSleep (UINT64 milliseconds) { DPRINT("AcpiOsSleep %d\n", milliseconds); - KeStallExecutionProcessor(milliseconds*1000); + KeStallExecutionProcessor(milliseconds*1000); } void @@ -263,14 +280,14 @@ DPRINT1("Bad parameter\n"); return AE_BAD_PARAMETER; } - + Mutex = ExAllocatePool(NonPagedPool, sizeof(FAST_MUTEX)); if (!Mutex) return AE_NO_MEMORY; - + ExInitializeFastMutex(Mutex); - + *OutHandle = (ACPI_MUTEX)Mutex; - + return AE_OK; } @@ -283,7 +300,7 @@ DPRINT1("Bad parameter\n"); return; } - + ExFreePool(Handle); } @@ -323,7 +340,7 @@ DPRINT1("Bad parameter\n"); return; } - + ExReleaseFastMutex((PFAST_MUTEX)Handle); } @@ -346,16 +363,16 @@ DPRINT1("Bad parameter\n"); return AE_BAD_PARAMETER; } - + Sem = ExAllocatePool(NonPagedPool, sizeof(ACPI_SEM)); if (!Sem) return AE_NO_MEMORY; Sem->CurrentUnits = InitialUnits; KeInitializeEvent(&Sem->Event, SynchronizationEvent, Sem->CurrentUnits != 0); KeInitializeSpinLock(&Sem->Lock); - + *OutHandle = (ACPI_SEMAPHORE)Sem; - + return AE_OK; } @@ -368,9 +385,9 @@ DPRINT1("Bad parameter\n"); return AE_BAD_PARAMETER; } - + ExFreePool(Handle); - + return AE_OK; } @@ -410,13 +427,13 @@ NULL); KeAcquireSpinLock(&Sem->Lock, &OldIrql); } - + Sem->CurrentUnits -= Units; - + if (Sem->CurrentUnits != 0) KeSetEvent(&Sem->Event, IO_NO_INCREMENT, FALSE); - + KeReleaseSpinLock(&Sem->Lock, OldIrql); - + return AE_OK; } @@ -435,12 +452,12 @@ } KeAcquireSpinLock(&Sem->Lock, &OldIrql); - + Sem->CurrentUnits += Units; KeSetEvent(&Sem->Event, IO_NO_INCREMENT, FALSE); - + KeReleaseSpinLock(&Sem->Lock, OldIrql); - + return AE_OK; } @@ -455,14 +472,14 @@ DPRINT1("Bad parameter\n"); return AE_BAD_PARAMETER; } - + SpinLock = ExAllocatePool(NonPagedPool, sizeof(KSPIN_LOCK)); if (!SpinLock) return AE_NO_MEMORY; - + KeInitializeSpinLock(SpinLock); - + *OutHandle = (ACPI_SPINLOCK)SpinLock; - + return AE_OK; } @@ -475,7 +492,7 @@ DPRINT1("Bad parameter\n"); return; } - + ExFreePool(Handle); } @@ -484,7 +501,7 @@ ACPI_SPINLOCK Handle) { KIRQL OldIrql; - + if ((OldIrql = KeGetCurrentIrql()) >= DISPATCH_LEVEL) { KeAcquireSpinLockAtDpcLevel((PKSPIN_LOCK)Handle); @@ -493,7 +510,7 @@ { KeAcquireSpinLock((PKSPIN_LOCK)Handle, &OldIrql); } - + return (ACPI_CPU_FLAGS)OldIrql; } @@ -503,7 +520,7 @@ ACPI_CPU_FLAGS Flags) { KIRQL OldIrql = (KIRQL)Flags; - + if (OldIrql >= DISPATCH_LEVEL) { KeReleaseSpinLockFromDpcLevel((PKSPIN_LOCK)Handle); @@ -539,13 +556,13 @@ KIRQL DIrql; KAFFINITY Affinity; NTSTATUS Status; - + if (AcpiInterruptHandlerRegistered) { DPRINT1("Reregister interrupt attempt failed\n"); return AE_ALREADY_EXISTS; } - + if (!ServiceRoutine) { DPRINT1("Bad parameter\n"); @@ -593,13 +610,13 @@ ACPI_OSD_HANDLER ServiceRoutine) { DPRINT("AcpiOsRemoveInterruptHandler()\n"); - + if (!ServiceRoutine) { DPRINT1("Bad parameter\n"); return AE_BAD_PARAMETER; } - + if (AcpiInterruptHandlerRegistered) { IoDisconnectInterrupt(AcpiInterrupt); @@ -618,7 +635,7 @@ ACPI_STATUS AcpiOsReadMemory ( ACPI_PHYSICAL_ADDRESS Address, - UINT32 *Value, + UINT64 *Value, UINT32 Width) { DPRINT("AcpiOsReadMemory %p\n", Address); @@ -627,11 +644,17 @@ case 8: *Value = (*(PUCHAR)(ULONG_PTR)Address); break; + case 16: *Value = (*(PUSHORT)(ULONG_PTR)Address); break; + case 32: *Value = (*(PULONG)(ULONG_PTR)Address); + break; + + case 64: + *Value = (*(PULONGLONG)(ULONG_PTR)Address); break; default: @@ -645,7 +668,7 @@ ACPI_STATUS AcpiOsWriteMemory ( ACPI_PHYSICAL_ADDRESS Address, - UINT32 Value, + UINT64 Value, UINT32 Width) { DPRINT("AcpiOsWriteMemory %p\n", Address); @@ -654,11 +677,17 @@ case 8: *(PUCHAR)(ULONG_PTR)Address = Value; break; + case 16: *(PUSHORT)(ULONG_PTR)Address = Value; break; + case 32: *(PULONG)(ULONG_PTR)Address = Value; + break; + + case 64: + *(PULONGLONG)(ULONG_PTR)Address = Value; break; default: @@ -691,6 +720,7 @@ case 32: *Value = READ_PORT_ULONG((PULONG)Address); break; + default: DPRINT1("AcpiOsReadPort got bad width: %d\n",Width); return (AE_BAD_PARAMETER); @@ -719,7 +749,7 @@ case 32: WRITE_PORT_ULONG((PULONG)Address, Value); break; - + default: DPRINT1("AcpiOsWritePort got bad width: %d\n",Width); return (AE_BAD_PARAMETER); @@ -857,10 +887,19 @@ void) { LARGE_INTEGER CurrentTime; - + KeQuerySystemTime(&CurrentTime); - return CurrentTime.QuadPart; +} + +void +AcpiOsWaitEventsComplete(void) +{ + /* + * Wait for all asynchronous events to complete. + * This implementation does nothing. + */ + return; } ACPI_STATUS @@ -869,7 +908,7 @@ void *Info) { ACPI_SIGNAL_FATAL_INFO *FatalInfo = Info; - + switch (Function) { case ACPI_SIGNAL_FATAL: @@ -885,7 +924,7 @@ DPRINT1 ("AcpiOsBreakpoint ****\n"); break; } - + ASSERT(FALSE); return (AE_OK);

1 0

[hbelusca] 62607: [ACPICA] Addendum to revision 62606 : because of typedefs redefinitions (we, after, include acpi.h and co. together with DDK in other acpi bus drivers), we hackishly needed to dis...
by hbelusca＠svn.reactos.org 03 Apr '14

03 Apr '14

Author: hbelusca Date: Thu Apr 3 23:32:58 2014 New Revision: 62607 URL: http://svn.reactos.org/svn/reactos?rev=62607&view=rev Log: [ACPICA] Addendum to revision 62606 : because of typedefs redefinitions (we, after, include acpi.h and co. together with DDK in other acpi bus drivers), we hackishly needed to disable them in actypes.h, and now we need to include ntddk *inside* acpi.h ... Everything would be nice only if ACPICA would not have the "clever" (read: dumb) idea to define a ACPI_BIOS_ERROR macro, which is (you guessed it) already defined.... in the DDK via the standard bugcheck code macros. So we introduce two hacks: the firs one right after the inclusion of ntddk.h *in* acpi.h to first undefine the macro (coming from bugcheck.h), *then*, we re-undefine it *after* the inclusion of acpi.h (in the precompiled header) so that drivers that need to use acpi (via the header) can after, include the ntddk.h ... What a hack :DD Part 2bis of our modifications to ACPICA code. CORE-8044 Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpi.h trunk/reactos/drivers/bus/acpi/precomp.h Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acpi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acpi.h [iso-8859-1] Thu Apr 3 23:32:58 2014 @@ -117,6 +117,12 @@ #define __ACPI_H__ /* + * Header inclusion HACK (see modifications to actypes.h too). + */ +#include <ntddk.h> +#undef ACPI_BIOS_ERROR // ACPI_BIOS_ERROR is redefined in acoutput.h + +/* * Public include files for use by code that will interface to ACPICA. * * Information includes the ACPICA data types, names, exceptions, and Modified: trunk/reactos/drivers/bus/acpi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/precomp.h… ============================================================================== --- trunk/reactos/drivers/bus/acpi/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/precomp.h [iso-8859-1] Thu Apr 3 23:32:58 2014 @@ -1,7 +1,14 @@ #ifndef _ACPI_PCH_ #define _ACPI_PCH_ +#include <stdio.h> + #include <acpi.h> + +// ACPI_BIOS_ERROR was defined in acoutput.h, but is +// redefined in bugcodes.h included from the DDK. +#undef ACPI_BIOS_ERROR + #include <acpisys.h> #include <acpi_bus.h> #include <acpi_drivers.h>

1 0

[hbelusca] 62606: [ACPICA] Disable redundant typedefs that we already got from the inclusion of ntddk.h from elsewhere (and it was done like that in our old modifications of ACPICA). Personally I d...
by hbelusca＠svn.reactos.org 03 Apr '14

03 Apr '14

Author: hbelusca Date: Thu Apr 3 22:09:20 2014 New Revision: 62606 URL: http://svn.reactos.org/svn/reactos?rev=62606&view=rev Log: [ACPICA] Disable redundant typedefs that we already got from the inclusion of ntddk.h from elsewhere (and it was done like that in our old modifications of ACPICA). Personally I don't like this way to go, but for the moment just apply something that (seemed to) worked before... Part 2 of our modifications to ACPICA code. CORE-8044 Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h [iso-8859-1] Thu Apr 3 22:09:20 2014 @@ -196,11 +196,11 @@ * ******************************************************************************/ -typedef unsigned char BOOLEAN; -typedef unsigned char UINT8; -typedef unsigned short UINT16; -typedef COMPILER_DEPENDENT_UINT64 UINT64; -typedef COMPILER_DEPENDENT_INT64 INT64; +// typedef unsigned char BOOLEAN; +// typedef unsigned char UINT8; +// typedef unsigned short UINT16; +// typedef COMPILER_DEPENDENT_UINT64 UINT64; +// typedef COMPILER_DEPENDENT_INT64 INT64; /*! [End] no source code translation !*/ @@ -225,8 +225,8 @@ /*! [Begin] no source code translation (keep the typedefs as-is) */ -typedef unsigned int UINT32; -typedef int INT32; +// typedef unsigned int UINT32; +// typedef int INT32; /*! [End] no source code translation !*/ @@ -264,8 +264,8 @@ /*! [Begin] no source code translation (keep the typedefs as-is) */ -typedef unsigned int UINT32; -typedef int INT32; +// typedef unsigned int UINT32; +// typedef int INT32; /*! [End] no source code translation !*/

1 0

[hbelusca] 62605: [ACPICA] Do not assume that, when compiling from Windows, we cannot use GCC. In fact we can, and this is what we did before... Move asm-specific code to where it should belong. I'...
by hbelusca＠svn.reactos.org 03 Apr '14

03 Apr '14

Author: hbelusca Date: Thu Apr 3 22:03:14 2014 New Revision: 62605 URL: http://svn.reactos.org/svn/reactos?rev=62605&view=rev Log: [ACPICA] Do not assume that, when compiling from Windows, we cannot use GCC. In fact we can, and this is what we did before... Move asm-specific code to where it should belong. I've checked that: MSVC_asm_code(old_acpica_version) == MSVC_asm_code(new_acpica_version), so that I took its GCC equivalent from our old version of ACPICA and placed it there. Part 1 of our modifications to ACPICA code. CORE-8044 Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvc.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin.h Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h [iso-8859-1] Thu Apr 3 22:03:14 2014 @@ -147,4 +147,65 @@ #undef strchr #endif + +/* Flush CPU cache - used when going to sleep. Wbinvd or similar. */ + +#ifdef ACPI_APPLICATION +#define ACPI_FLUSH_CPU_CACHE() +#else +#define ACPI_FLUSH_CPU_CACHE() asm ("WBINVD") +#endif + +/* + * Global Lock acquire/release code + * + * Note: Taken from our old adaptation. + * TODO: Check whether it is equivalent to the MSVC code + * (which was also the same in the older version). + */ +#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ +do { \ + int dummy; \ + asm("1: movl (%1),%%eax;" \ + "movl %%eax,%%edx;" \ + "andl %2,%%edx;" \ + "btsl $0x1,%%edx;" \ + "adcl $0x0,%%edx;" \ + "lock; cmpxchgl %%edx,(%1);" \ + "jnz 1b;" \ + "cmpb $0x3,%%dl;" \ + "sbbl %%eax,%%eax" \ + :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~1L):"dx"); \ +} while(0) + +#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ +do { \ + int dummy; \ + asm("1: movl (%1),%%eax;" \ + "movl %%eax,%%edx;" \ + "andl %2,%%edx;" \ + "lock; cmpxchgl %%edx,(%1);" \ + "jnz 1b;" \ + "andl $0x1,%%eax" \ + :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~3L):"dx"); \ +} while(0) + + +/* + * Note: This is also taken from our old adaptation. + * See acmsvc.h for where it came originally. + */ +#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ +{ \ + q32 = n_hi / d32; \ + r32 = n_lo / d32; \ +} + +#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ +{ \ + n_hi >>= 1; \ + n_lo >>= 1; \ +} + + #endif /* __ACGCC_H__ */ Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvc.h [iso-8859-1] Thu Apr 3 22:03:14 2014 @@ -202,6 +202,67 @@ } #endif + +/* Flush CPU cache - used when going to sleep. Wbinvd or similar. */ + +#ifdef ACPI_APPLICATION +#define ACPI_FLUSH_CPU_CACHE() +#else +#define ACPI_FLUSH_CPU_CACHE() __asm {WBINVD} +#endif + +/* + * Global Lock acquire/release code + * + * Note: Handles case where the FACS pointer is null + */ +#define ACPI_ACQUIRE_GLOBAL_LOCK(FacsPtr, Acq) __asm \ +{ \ + __asm mov eax, 0xFF \ + __asm mov ecx, FacsPtr \ + __asm or ecx, ecx \ + __asm jz exit_acq \ + __asm lea ecx, [ecx].GlobalLock \ + \ + __asm acq10: \ + __asm mov eax, [ecx] \ + __asm mov edx, eax \ + __asm and edx, 0xFFFFFFFE \ + __asm bts edx, 1 \ + __asm adc edx, 0 \ + __asm lock cmpxchg dword ptr [ecx], edx \ + __asm jnz acq10 \ + \ + __asm cmp dl, 3 \ + __asm sbb eax, eax \ + \ + __asm exit_acq: \ + __asm mov Acq, al \ +} + +#define ACPI_RELEASE_GLOBAL_LOCK(FacsPtr, Pnd) __asm \ +{ \ + __asm xor eax, eax \ + __asm mov ecx, FacsPtr \ + __asm or ecx, ecx \ + __asm jz exit_rel \ + __asm lea ecx, [ecx].GlobalLock \ + \ + __asm Rel10: \ + __asm mov eax, [ecx] \ + __asm mov edx, eax \ + __asm and edx, 0xFFFFFFFC \ + __asm lock cmpxchg dword ptr [ecx], edx \ + __asm jnz Rel10 \ + \ + __asm cmp dl, 3 \ + __asm and eax, 1 \ + \ + __asm exit_rel: \ + __asm mov Pnd, al \ +} + + /* warn C4100: unreferenced formal parameter */ #pragma warning(disable:4100) Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin.h [iso-8859-1] Thu Apr 3 22:03:14 2014 @@ -118,9 +118,11 @@ /*! [Begin] no source code translation (Keep the include) */ -/* Windows uses VC */ -#ifdef _MSC_VER +/* Windows uses VC or GCC */ +#if defined(_MSC_VER) #include "acmsvc.h" +#elif defined(__GNUC__) +#include "acgcc.h" #endif /*! [End] no source code translation !*/ @@ -152,67 +154,10 @@ /*! [Begin] no source code translation */ -#ifdef ACPI_APPLICATION -#define ACPI_FLUSH_CPU_CACHE() -#else -#define ACPI_FLUSH_CPU_CACHE() __asm {WBINVD} -#endif - #ifdef _DEBUG #define ACPI_SIMPLE_RETURN_MACROS #endif /*! [End] no source code translation !*/ -/* - * Global Lock acquire/release code - * - * Note: Handles case where the FACS pointer is null - */ -#define ACPI_ACQUIRE_GLOBAL_LOCK(FacsPtr, Acq) __asm \ -{ \ - __asm mov eax, 0xFF \ - __asm mov ecx, FacsPtr \ - __asm or ecx, ecx \ - __asm jz exit_acq \ - __asm lea ecx, [ecx].GlobalLock \ - \ - __asm acq10: \ - __asm mov eax, [ecx] \ - __asm mov edx, eax \ - __asm and edx, 0xFFFFFFFE \ - __asm bts edx, 1 \ - __asm adc edx, 0 \ - __asm lock cmpxchg dword ptr [ecx], edx \ - __asm jnz acq10 \ - \ - __asm cmp dl, 3 \ - __asm sbb eax, eax \ - \ - __asm exit_acq: \ - __asm mov Acq, al \ -} - -#define ACPI_RELEASE_GLOBAL_LOCK(FacsPtr, Pnd) __asm \ -{ \ - __asm xor eax, eax \ - __asm mov ecx, FacsPtr \ - __asm or ecx, ecx \ - __asm jz exit_rel \ - __asm lea ecx, [ecx].GlobalLock \ - \ - __asm Rel10: \ - __asm mov eax, [ecx] \ - __asm mov edx, eax \ - __asm and edx, 0xFFFFFFFC \ - __asm lock cmpxchg dword ptr [ecx], edx \ - __asm jnz Rel10 \ - \ - __asm cmp dl, 3 \ - __asm and eax, 1 \ - \ - __asm exit_rel: \ - __asm mov Pnd, al \ -} - #endif /* __ACWIN_H__ */

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