Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[navaraf] 14115: Accidently forgot to disable the debug messages.

by navaraf＠svn.reactos.com

Accidently forgot to disable the debug messages. Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-03-15 23:27:36 UTC (rev 14114) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-03-15 23:33:54 UTC (rev 14115) @@ -11,7 +11,7 @@ #include <bm.h> #include <bn.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> FADT_DESCRIPTOR_REV2 acpi_fadt;

19 years, 6 months

[navaraf] 14114: Don't use uninitialized variable in FdoQueryBusRelations.

by navaraf＠svn.reactos.com

Don't use uninitialized variable in FdoQueryBusRelations. Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-03-15 23:02:51 UTC (rev 14113) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-03-15 23:27:36 UTC (rev 14114) @@ -11,7 +11,7 @@ #include <bm.h> #include <bn.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> FADT_DESCRIPTOR_REV2 acpi_fadt; @@ -126,7 +126,7 @@ ANSI_STRING AnsiString; ACPI_STATUS AcpiStatus; PACPI_DEVICE Device; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BM_NODE *Node; ULONG Size; ULONG i;

19 years, 6 months

[navaraf] 14113: Fix broken logic in PoInit.

by navaraf＠svn.reactos.com

Fix broken logic in PoInit. Modified: trunk/reactos/ntoskrnl/po/power.c _____ Modified: trunk/reactos/ntoskrnl/po/power.c --- trunk/reactos/ntoskrnl/po/power.c 2005-03-15 23:02:12 UTC (rev 14112) +++ trunk/reactos/ntoskrnl/po/power.c 2005-03-15 23:02:51 UTC (rev 14113) @@ -196,11 +196,16 @@ PoInit(PLOADER_PARAMETER_BLOCK LoaderBlock, BOOLEAN ForceAcpiDisable) { - /* Set the ACPI State to False if it's been forced that way */ - if (ForceAcpiDisable) PopAcpiPresent = FALSE; - - /* Otherwise check the LoaderBlock's Flag */ - PopAcpiPresent = LoaderBlock->Flags & MB_FLAGS_ACPI_TABLE; + if (ForceAcpiDisable) + { + /* Set the ACPI State to False if it's been forced that way */ + PopAcpiPresent = FALSE; + } + else + { + /* Otherwise check the LoaderBlock's Flag */ + PopAcpiPresent = (LoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; + } } /*

19 years, 6 months

[navaraf] 14112: Set the ACPI flag in loader block *after* performing the ACPI detection.

by navaraf＠svn.reactos.com

Set the ACPI flag in loader block *after* performing the ACPI detection. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-03-15 22:26:12 UTC (rev 14111) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-03-15 23:02:12 UTC (rev 14112) @@ -578,9 +578,9 @@ PARTITION_TABLE_ENTRY PartitionTableEntry; ULONG rosPartition; - extern ULONG PageDirectoryStart; - extern ULONG PageDirectoryEnd; - extern BOOLEAN AcpiPresent; + extern ULONG PageDirectoryStart; + extern ULONG PageDirectoryEnd; + extern BOOLEAN AcpiPresent; // // Open the operating system section @@ -597,7 +597,6 @@ * Setup multiboot information structure */ LoaderBlock.Flags = MB_INFO_FLAG_MEM_SIZE | MB_INFO_FLAG_BOOT_DEVICE | MB_INFO_FLAG_COMMAND_LINE | MB_INFO_FLAG_MODULES; - if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE; LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.BootDevice = 0xffffffff; @@ -736,6 +735,7 @@ */ MachHwDetect(); + if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE; UiDrawStatusText("Loading..."); UiDrawProgressBarCenter(0, 100, "Loading ReactOS...");

19 years, 6 months

[blight] 14111: Improve the WNDOBJ implementation a bit... There are still some problems with the visible area when a window is overlapped by another one...

by blight＠svn.reactos.com

Improve the WNDOBJ implementation a bit... There are still some problems with the visible area when a window is overlapped by another one... Modified: trunk/reactos/subsys/win32k/eng/objects.h Modified: trunk/reactos/subsys/win32k/eng/window.c Modified: trunk/reactos/subsys/win32k/include/eng.h Modified: trunk/reactos/subsys/win32k/include/intgdi.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/eng/objects.h --- trunk/reactos/subsys/win32k/eng/objects.h 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/eng/objects.h 2005-03-15 22:26:12 UTC (rev 14111) @@ -130,6 +130,8 @@ typedef struct _WNDGDI { WNDOBJ WndObj; + LIST_ENTRY ListEntry; + HWND Hwnd; CLIPOBJ *ClientClipObj; WNDOBJCHANGEPROC ChangeProc; FLONG Flags; _____ Modified: trunk/reactos/subsys/win32k/eng/window.c --- trunk/reactos/subsys/win32k/eng/window.c 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/eng/window.c 2005-03-15 22:26:12 UTC (rev 14111) @@ -26,6 +26,9 @@ * REVISION HISTORY: * 16/11/2004: Created */ + +/* TODO: Check how the WNDOBJ implementation should behave with a driver on windows. */ + #include <w32k.h> /* @@ -33,9 +36,9 @@ */ VOID FASTCALL -IntEngWndChanged( - IN WNDOBJ *pwo, - IN FLONG flChanged) +IntEngWndCallChangeProc( + IN WNDOBJ *pwo, + IN FLONG flChanged) { WNDGDI *WndObjInt = ObjToGDI(pwo, WND); @@ -63,22 +66,144 @@ } /* + * Fills the CLIPOBJ and client rect of the WNDOBJ with the data from the given WINDOW_OBJECT + */ +BOOLEAN +FASTCALL +IntEngWndUpdateClipObj( + WNDGDI *WndObjInt, + PWINDOW_OBJECT Window) +{ + HRGN hVisRgn; + PROSRGNDATA visRgn; + CLIPOBJ *ClipObj = NULL; + CLIPOBJ *OldClipObj; + + hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); + if (hVisRgn != NULL) + { + NtGdiOffsetRgn(hVisRgn, Window->ClientRect.left, Window->ClientRect.top); + visRgn = RGNDATA_LockRgn(hVisRgn); + if (visRgn != NULL) + { + if (visRgn->rdh.nCount > 0) + { + ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, (PRECTL)visRgn->Buffer, + (PRECTL)&visRgn->rdh.rcBound); + DPRINT("Created visible region with %d rects\n", visRgn->rdh.nCount); + DPRINT(" BoundingRect: %d, %d %d, %d\n", + visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, + visRgn->rdh.rcBound.right, visRgn->rdh.rcBound.bottom); + { + INT i; + for (i = 0; i < visRgn->rdh.nCount; i++) + { + DPRINT(" Rect #%d: %d,%d %d,%d\n", i+1, + visRgn->Buffer[i].left, visRgn->Buffer[i].top, + visRgn->Buffer[i].right, visRgn->Buffer[i].bottom); + } + } + } + RGNDATA_UnlockRgn(hVisRgn); + } + else + { + DPRINT1("Warning: Couldn't lock visible region of window DC\n"); + } + } + else + { + DPRINT1("Warning: VIS_ComputeVisibleRegion failed!\n"); + } + + if (ClipObj == NULL) + { + /* Fall back to client rect */ + ClipObj = IntEngCreateClipRegion(1, (PRECTL)&Window->ClientRect, + (PRECTL)&Window->ClientRect); + } + + if (ClipObj == NULL) + { + DPRINT1("Warning: IntEngCreateClipRegion() failed!\n"); + return FALSE; + } + + RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); + RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->ClientRect, sizeof (RECT)); + OldClipObj = InterlockedExchangePointer(&WndObjInt->ClientClipObj, ClipObj); + if (OldClipObj != NULL) + IntEngDeleteClipRegion(OldClipObj); + + return TRUE; +} + +/* + * Updates all WNDOBJs of the given WINDOW_OBJECT and calls the change-procs. + */ +VOID +FASTCALL +IntEngWindowChanged( + PWINDOW_OBJECT Window, + FLONG flChanged) +{ + PLIST_ENTRY CurrentEntry; + WNDGDI *Current; + + ASSERT_IRQL(PASSIVE_LEVEL); + + ExAcquireFastMutex(&Window->WndObjListLock); + CurrentEntry = Window->WndObjListHead.Flink; + while (CurrentEntry != &Window->WndObjListHead) + { + Current = CONTAINING_RECORD(CurrentEntry, WNDGDI, ListEntry); + + if (Current->WndObj.pvConsumer != NULL) + { + /* Update the WNDOBJ */ + switch (flChanged) + { + case WOC_RGN_CLIENT: + /* Update the clipobj and client rect of the WNDOBJ */ + IntEngWndUpdateClipObj(Current, Window); + break; + + case WOC_DELETE: + /* FIXME: Should the WNDOBJs be deleted by win32k or by the driver? */ + break; + } + + /* Call the change proc */ + IntEngWndCallChangeProc(&Current->WndObj, flChanged); + + /* HACK: Send WOC_CHANGED after WOC_RGN_CLIENT */ + if (flChanged == WOC_RGN_CLIENT) + { + IntEngWndCallChangeProc(&Current->WndObj, WOC_CHANGED); + } + + CurrentEntry = CurrentEntry->Flink; + } + } + + ExReleaseFastMutex(&Window->WndObjListLock); +} + +/* * @implemented */ WNDOBJ* STDCALL EngCreateWnd( - SURFOBJ *pso, - HWND hwnd, - WNDOBJCHANGEPROC pfn, - FLONG fl, - int iPixelFormat - ) + SURFOBJ *pso, + HWND hwnd, + WNDOBJCHANGEPROC pfn, + FLONG fl, + int iPixelFormat) { WNDGDI *WndObjInt = NULL; WNDOBJ *WndObjUser = NULL; PWINDOW_OBJECT Window; - CLIPOBJ *ClientClipObj; DPRINT("EngCreateWnd: pso = 0x%x, hwnd = 0x%x, pfn = 0x%x, fl = 0x%x, pixfmt = %d\n", pso, hwnd, pfn, fl, iPixelFormat); @@ -99,28 +224,31 @@ return NULL; } - ClientClipObj = IntEngCreateClipRegion(1, (PRECTL)&Window->ClientRect, - (PRECTL)&Window->ClientRect); - if (ClientClipObj == NULL) + /* Fill the clipobj */ + WndObjInt->ClientClipObj = NULL; + if (!IntEngWndUpdateClipObj(WndObjInt, Window)) { IntReleaseWindowObject(Window); EngFreeMem(WndObjInt); return NULL; } - /* fill user object */ + /* Fill user object */ WndObjUser = GDIToObj(WndObjInt, WND); WndObjUser->psoOwner = pso; WndObjUser->pvConsumer = NULL; - RtlCopyMemory(&WndObjUser->rclClient, &Window->ClientRect, sizeof (RECT)); - RtlCopyMemory(&WndObjUser->coClient, ClientClipObj, sizeof (CLIPOBJ)); - /* fill internal object */ + /* Fill internal object */ + WndObjInt->Hwnd = hwnd; WndObjInt->ChangeProc = pfn; WndObjInt->Flags = fl; WndObjInt->PixelFormat = iPixelFormat; - WndObjInt->ClientClipObj = ClientClipObj; + /* associate object with window */ + ExAcquireFastMutex(&Window->WndObjListLock); + InsertTailList(&Window->WndObjListHead, &WndObjInt->ListEntry); + ExReleaseFastMutex(&Window->WndObjListLock); + /* release resources */ IntReleaseWindowObject(Window); @@ -135,12 +263,31 @@ */ VOID STDCALL -EngDeleteWnd ( IN WNDOBJ *pwo ) +EngDeleteWnd( + IN WNDOBJ *pwo) { WNDGDI *WndObjInt = ObjToGDI(pwo, WND); - + PWINDOW_OBJECT Window; + DPRINT("EngDeleteWnd: pwo = 0x%x\n", pwo); + /* Get window object */ + Window = IntGetWindowObject(WndObjInt->Hwnd); + if (Window == NULL) + { + DPRINT1("Warning: Couldnt get window object for WndObjInt->Hwnd!!!\n"); + RemoveEntryList(&WndObjInt->ListEntry); + } + else + { + /* Remove object from window */ + ExAcquireFastMutex(&Window->WndObjListLock); + RemoveEntryList(&WndObjInt->ListEntry); + ExReleaseFastMutex(&Window->WndObjListLock); + IntReleaseWindowObject(Window); + } + + /* Free resources */ IntEngDeleteClipRegion(WndObjInt->ClientClipObj); EngFreeMem(WndObjInt); } @@ -152,10 +299,9 @@ BOOL STDCALL WNDOBJ_bEnum( - IN WNDOBJ *pwo, - IN ULONG cj, - OUT ULONG *pul - ) + IN WNDOBJ *pwo, + IN ULONG cj, + OUT ULONG *pul) { WNDGDI *WndObjInt = ObjToGDI(pwo, WND); BOOL Ret; @@ -174,11 +320,10 @@ ULONG STDCALL WNDOBJ_cEnumStart( - IN WNDOBJ *pwo, - IN ULONG iType, - IN ULONG iDirection, - IN ULONG cLimit - ) + IN WNDOBJ *pwo, + IN ULONG iType, + IN ULONG iDirection, + IN ULONG cLimit) { WNDGDI *WndObjInt = ObjToGDI(pwo, WND); ULONG Ret; @@ -200,9 +345,8 @@ VOID STDCALL WNDOBJ_vSetConsumer( - IN WNDOBJ *pwo, - IN PVOID pvConsumer - ) + IN WNDOBJ *pwo, + IN PVOID pvConsumer) { BOOL Hack; @@ -211,12 +355,19 @@ Hack = (pwo->pvConsumer == NULL); pwo->pvConsumer = pvConsumer; - /* HACKHACKHACK */ + /* HACKHACKHACK + * + * MSDN says that the WNDOBJCHANGEPROC will be called with the most recent state + * when a WNDOBJ is created - we do it here because most drivers will need pvConsumer + * in the callback to identify the WNDOBJ I think. + * + * - blight + */ if (Hack) { - IntEngWndChanged(pwo, WOC_RGN_CLIENT); - IntEngWndChanged(pwo, WOC_CHANGED); - IntEngWndChanged(pwo, WOC_DRAWN); + IntEngWndCallChangeProc(pwo, WOC_RGN_CLIENT); + IntEngWndCallChangeProc(pwo, WOC_CHANGED); + IntEngWndCallChangeProc(pwo, WOC_DRAWN); } } _____ Modified: trunk/reactos/subsys/win32k/include/eng.h --- trunk/reactos/subsys/win32k/include/eng.h 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/include/eng.h 2005-03-15 22:26:12 UTC (rev 14111) @@ -15,4 +15,9 @@ BRUSHOBJ *Brush, POINTL *BrushOrigin); +VOID FASTCALL +IntEngWindowChanged( + PWINDOW_OBJECT Window, + FLONG flChanged); + #endif /* _WIN32K_ENG_H */ _____ Modified: trunk/reactos/subsys/win32k/include/intgdi.h --- trunk/reactos/subsys/win32k/include/intgdi.h 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/include/intgdi.h 2005-03-15 22:26:12 UTC (rev 14111) @@ -193,5 +193,21 @@ LPCSTR InData, LPVOID OutData); +BOOL +FASTCALL +IntEnumDisplaySettings( + IN PUNICODE_STRING pDeviceName OPTIONAL, + IN DWORD iModeNum, + IN OUT LPDEVMODEW pDevMode, + IN DWORD dwFlags); + +LONG +FASTCALL +IntChangeDisplaySettings( + IN PUNICODE_STRING pDeviceName OPTIONAL, + IN LPDEVMODEW pDevMode, + IN DWORD dwflags, + IN PVOID lParam OPTIONAL); + #endif /* _WIN32K_INTGDI_H */ _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/include/window.h 2005-03-15 22:26:12 UTC (rev 14111) @@ -99,6 +99,9 @@ ULONG Status; /* counter for tiled child windows */ ULONG TiledCounter; + /* WNDOBJ list */ + LIST_ENTRY WndObjListHead; + FAST_MUTEX WndObjListLock; } WINDOW_OBJECT; /* PWINDOW_OBJECT already declared at top of file */ /* Window flags. */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-03-15 22:26:12 UTC (rev 14111) @@ -110,20 +110,6 @@ return 0; } -LONG -STDCALL -NtUserChangeDisplaySettings( - PUNICODE_STRING lpszDeviceName, - LPDEVMODEW lpDevMode, - HWND hwnd, - DWORD dwflags, - LPVOID lParam) -{ - // UNIMPLEMENTED - DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ); - return DISP_CHANGE_BADMODE; -} - DWORD STDCALL NtUserConvertMemHandle( _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2005-03-15 22:26:12 UTC (rev 14111) @@ -354,6 +354,11 @@ Dce->DCXFlags &= ~DCX_DCEDIRTY; NtGdiSelectVisRgn(Dce->hDC, hRgnVisible); + if (Window != NULL) + { + IntEngWindowChanged(Window, WOC_RGN_CLIENT); + } + if (hRgnVisible != NULL) { NtGdiDeleteObject(hRgnVisible); @@ -856,6 +861,7 @@ if (Window->Self != pDCE->hwndCurrent) { +// IntEngWindowChanged(CurrentWindow, WOC_RGN_CLIENT); IntReleaseWindowObject(CurrentWindow); } } @@ -866,13 +872,6 @@ DCE_UnlockList(); } -/* FIXME: find header file for this prototype. */ -extern BOOL FASTCALL -IntEnumDisplaySettings( - PUNICODE_STRING lpszDeviceName, - DWORD iModeNum, - LPDEVMODEW lpDevMode, - DWORD dwFlags); #define COPY_DEVMODE_VALUE_TO_CALLER(dst, src, member) \ Status = MmCopyToCaller(&(dst)->member, &(src)->member, sizeof ((src)->member)); \ @@ -893,15 +892,18 @@ { NTSTATUS Status; LPDEVMODEW pSafeDevMode; - DWORD Size = 0, ExtraSize = 0; + PUNICODE_STRING pSafeDeviceName = NULL; + UNICODE_STRING SafeDeviceName; + USHORT Size = 0, ExtraSize = 0; - Status = MmCopyFromCaller(&Size, &lpDevMode->dmSize, sizeof (lpDevMode->dmSize)); + /* Copy the devmode */ + Status = MmCopyFromCaller(&Size, &lpDevMode->dmSize, sizeof (Size)); if (!NT_SUCCESS(Status)) { SetLastNtError(Status); return FALSE; } - Status = MmCopyFromCaller(&ExtraSize, &lpDevMode->dmDriverExtra, sizeof (lpDevMode->dmDriverExtra)); + Status = MmCopyFromCaller(&ExtraSize, &lpDevMode->dmDriverExtra, sizeof (ExtraSize)); if (!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -911,17 +913,36 @@ if (pSafeDevMode == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return DISP_CHANGE_FAILED; + return FALSE; } pSafeDevMode->dmSize = Size; pSafeDevMode->dmDriverExtra = ExtraSize; - if (!IntEnumDisplaySettings(lpszDeviceName, iModeNum, pSafeDevMode, dwFlags)) + /* Copy the device name */ + if (lpszDeviceName != NULL) { + Status = IntSafeCopyUnicodeString(&SafeDeviceName, lpszDeviceName); + if (!NT_SUCCESS(Status)) + { + ExFreePool(pSafeDevMode); + SetLastNtError(Status); + return FALSE; + } + pSafeDeviceName = &SafeDeviceName; + } + + /* Call internal function */ + if (!IntEnumDisplaySettings(pSafeDeviceName, iModeNum, pSafeDevMode, dwFlags)) + { + if (pSafeDeviceName != NULL) + RtlFreeUnicodeString(pSafeDeviceName); ExFreePool(pSafeDevMode); return FALSE; } + if (pSafeDeviceName != NULL) + RtlFreeUnicodeString(pSafeDeviceName); + /* Copy some information back */ COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmPelsWidth); COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmPelsHeight); COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmBitsPerPel); @@ -940,9 +961,84 @@ } } + ExFreePool(pSafeDevMode); return TRUE; } #undef COPY_DEVMODE_VALUE_TO_CALLER + +LONG +STDCALL +NtUserChangeDisplaySettings( + PUNICODE_STRING lpszDeviceName, + LPDEVMODEW lpDevMode, + HWND hwnd, + DWORD dwflags, + LPVOID lParam) +{ + NTSTATUS Status; + DEVMODEW DevMode; + PUNICODE_STRING pSafeDeviceName = NULL; + UNICODE_STRING SafeDeviceName; + LONG Ret; + + /* Check arguments */ +#ifdef CDS_VIDEOPARAMETERS + if (dwflags != CDS_VIDEOPARAMETERS && lParam != NULL) +#else + if (lParam != NULL) +#endif + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return DISP_CHANGE_BADPARAM; + } + if (hwnd != NULL) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return DISP_CHANGE_BADPARAM; + } + + /* Copy devmode */ + Status = MmCopyFromCaller(&DevMode.dmSize, &lpDevMode->dmSize, sizeof (DevMode.dmSize)); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } + DevMode.dmSize = min(sizeof (DevMode), DevMode.dmSize); + Status = MmCopyFromCaller(&DevMode, lpDevMode, DevMode.dmSize); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } + if (DevMode.dmDriverExtra > 0) + { + DbgPrint("(%s:%i) WIN32K: %s lpDevMode->dmDriverExtra is IGNORED!\n", __FILE__, __LINE__, __FUNCTION__); + DevMode.dmDriverExtra = 0; + } + + /* Copy the device name */ + if (lpszDeviceName != NULL) + { + Status = IntSafeCopyUnicodeString(&SafeDeviceName, lpszDeviceName); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } + pSafeDeviceName = &SafeDeviceName; + } + + /* Call internal function */ + Ret = IntChangeDisplaySettings(pSafeDeviceName, &DevMode, dwflags, lParam); + + if (pSafeDeviceName != NULL) + RtlFreeUnicodeString(pSafeDeviceName); + + return Ret; +} + + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-03-15 22:26:12 UTC (rev 14111) @@ -1618,6 +1618,8 @@ ExInitializeFastMutex(&WindowObject->PropListLock); ExInitializeFastMutex(&WindowObject->RelativesLock); ExInitializeFastMutex(&WindowObject->UpdateLock); + InitializeListHead(&WindowObject->WndObjListHead); + ExInitializeFastMutex(&WindowObject->WndObjListLock); if (NULL != WindowName->Buffer) { @@ -1975,6 +1977,9 @@ WindowObject->ClientRect.top); } IntSendMessage(WindowObject->Self, WM_MOVE, 0, lParam); + + /* Call WNDOBJ change procs */ + IntEngWindowChanged(WindowObject, WOC_RGN_CLIENT); } /* Show or maybe minimize or maximize the window. */ @@ -2180,6 +2185,7 @@ } #endif + IntEngWindowChanged(Window, WOC_DELETE); isChild = (0 != (Window->Style & WS_CHILD)); #if 0 /* FIXME */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-03-15 22:26:12 UTC (rev 14111) @@ -1341,6 +1341,7 @@ IntSendMessage(Wnd, WM_MOVE, 0, MAKELONG(Window->ClientRect.left, Window->ClientRect.top)); + IntEngWindowChanged(Window, WOC_RGN_CLIENT); } /* Activate the window if activation is not requested and the window is not minimized */ _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-03-15 22:14:22 UTC (rev 14110) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-03-15 22:26:12 UTC (rev 14111) @@ -2296,26 +2296,28 @@ /*! \brief Enumerate possible display settings for the given display... * * \todo Make thread safe!? - * \todo Don't ignore lpszDeviceName + * \todo Don't ignore pDeviceName * \todo Implement non-raw mode (only return settings valid for driver and monitor) */ BOOL FASTCALL IntEnumDisplaySettings( - PUNICODE_STRING lpszDeviceName, - DWORD iModeNum, - LPDEVMODEW lpDevMode, - DWORD dwFlags) + IN PUNICODE_STRING pDeviceName OPTIONAL, + IN DWORD iModeNum, + IN OUT LPDEVMODEW pDevMode, + IN DWORD dwFlags) { static DEVMODEW *CachedDevModes = NULL, *CachedDevModesEnd = NULL; static DWORD SizeOfCachedDevModes = 0; - LPDEVMODEW CachedMode = NULL; + PDEVMODEW CachedMode = NULL; DEVMODEW DevMode; INT Size, OldSize; ULONG DisplayNumber = 0; /* only default display supported */ - if (lpDevMode->dmSize != SIZEOF_DEVMODEW_300 && - lpDevMode->dmSize != SIZEOF_DEVMODEW_400 && - lpDevMode->dmSize != SIZEOF_DEVMODEW_500) + DPRINT1("DevMode->dmSize = %d\n", pDevMode->dmSize); + DPRINT1("DevMode->dmExtraSize = %d\n", pDevMode->dmDriverExtra); + if (pDevMode->dmSize != SIZEOF_DEVMODEW_300 && + pDevMode->dmSize != SIZEOF_DEVMODEW_400 && + pDevMode->dmSize != SIZEOF_DEVMODEW_500) { SetLastWin32Error(STATUS_INVALID_PARAMETER); return FALSE; @@ -2324,7 +2326,7 @@ if (iModeNum == ENUM_CURRENT_SETTINGS) { CachedMode = &PrimarySurface.DMW; - assert(CachedMode->dmSize > 0); + ASSERT(CachedMode->dmSize > 0); } else if (iModeNum == ENUM_REGISTRY_SETTINGS) { @@ -2488,24 +2490,90 @@ } } - assert(CachedMode != NULL); + ASSERT(CachedMode != NULL); - Size = OldSize = lpDevMode->dmSize; + Size = OldSize = pDevMode->dmSize; if (Size > CachedMode->dmSize) Size = CachedMode->dmSize; - RtlCopyMemory(lpDevMode, CachedMode, Size); - RtlZeroMemory((PCHAR)lpDevMode + Size, OldSize - Size); - lpDevMode->dmSize = OldSize; + RtlCopyMemory(pDevMode, CachedMode, Size); + RtlZeroMemory((PCHAR)pDevMode + Size, OldSize - Size); + pDevMode->dmSize = OldSize; - Size = OldSize = lpDevMode->dmDriverExtra; + Size = OldSize = pDevMode->dmDriverExtra; if (Size > CachedMode->dmDriverExtra) Size = CachedMode->dmDriverExtra; - RtlCopyMemory((PCHAR)lpDevMode + lpDevMode->dmSize, + RtlCopyMemory((PCHAR)pDevMode + pDevMode->dmSize, (PCHAR)CachedMode + CachedMode->dmSize, Size); - RtlZeroMemory((PCHAR)lpDevMode + lpDevMode->dmSize + Size, OldSize - Size); - lpDevMode->dmDriverExtra = OldSize; + RtlZeroMemory((PCHAR)pDevMode + pDevMode->dmSize + Size, OldSize - Size); + pDevMode->dmDriverExtra = OldSize; return TRUE; } +LONG +FASTCALL +IntChangeDisplaySettings( + IN PUNICODE_STRING pDeviceName OPTIONAL, + IN LPDEVMODEW DevMode, + IN DWORD dwflags, + IN PVOID lParam OPTIONAL) +{ + BOOLEAN Global = FALSE; + BOOLEAN NoReset = FALSE; + BOOLEAN Reset = FALSE; + BOOLEAN SetPrimary = FALSE; + LONG Ret; + + if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) + { + /* Check global, reset and noreset flags */ + if ((dwflags & CDS_GLOBAL) == CDS_GLOBAL) + Global = TRUE; + if ((dwflags & CDS_NORESET) == CDS_NORESET) + NoReset = TRUE; + dwflags &= ~(CDS_GLOBAL | CDS_NORESET); + } + if ((dwflags & CDS_RESET) == CDS_RESET) + Reset = TRUE; + if ((dwflags & CDS_SET_PRIMARY) == CDS_SET_PRIMARY) + SetPrimary = TRUE; + dwflags &= ~(CDS_RESET | CDS_SET_PRIMARY); + + if (Reset && NoReset) + return DISP_CHANGE_BADFLAGS; + + switch (dwflags) + { + case 0: /* Dynamically change graphics mode */ + Ret = DISP_CHANGE_FAILED; + break; + + case CDS_FULLSCREEN: /* Given mode is temporary */ + Ret = DISP_CHANGE_FAILED; + break; + + case CDS_UPDATEREGISTRY: + Ret = DISP_CHANGE_FAILED; + break; + + case CDS_TEST: /* Test if the mode could be set */ + Ret = DISP_CHANGE_FAILED; + break; + +#ifdef CDS_VIDEOPARAMETERS + case CDS_VIDEOPARAMETERS: + if (lParam == NULL) + return DISP_CHANGE_BADPARAM; + Ret = DISP_CHANGE_FAILED; + break; +#endif + + default: + Ret = DISP_CHANGE_BADFLAGS; + break; + } + + return Ret; +} + /* EOF */

19 years, 6 months

[gvg] 14110: Don't disable debugging just because we want the debug

by gvg＠svn.reactos.com

Don't disable debugging just because we want the debug prints to go to the screen or serial port Modified: trunk/reactos/ntoskrnl/kd/kdebug.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdebug.c --- trunk/reactos/ntoskrnl/kd/kdebug.c 2005-03-15 22:07:05 UTC (rev 14109) +++ trunk/reactos/ntoskrnl/kd/kdebug.c 2005-03-15 22:14:22 UTC (rev 14110) @@ -118,13 +118,11 @@ if (!_strnicmp(p2, "SCREEN", 6) && BootPhase > 0) { p2 += 6; - KdDebuggerEnabled = FALSE; KdDebugState |= KD_DEBUG_SCREEN; } else if (!_strnicmp(p2, "BOCHS", 5) && BootPhase == 0) { p2 += 5; - KdDebuggerEnabled = TRUE; KdDebugState |= KD_DEBUG_BOCHS; } else if (!_strnicmp(p2, "GDB", 3) && BootPhase == 0) @@ -150,7 +148,6 @@ Value = (ULONG)atol(p2); if (Value > 0 && Value < 5) { - KdDebuggerEnabled = FALSE; KdDebugState |= KD_DEBUG_SERIAL; LogPortInfo.ComPort = Value; } @@ -158,13 +155,11 @@ else if (!_strnicmp(p2, "FILE", 4) && BootPhase > 0) { p2 += 4; - KdDebuggerEnabled = FALSE; KdDebugState |= KD_DEBUG_FILELOG; } else if (!_strnicmp(p2, "MDA", 3) && BootPhase > 0) { p2 += 3; - KdDebuggerEnabled = TRUE; KdDebugState |= KD_DEBUG_MDA; } } @@ -172,13 +167,11 @@ else if (!_strnicmp(p2, "KDSERIAL", 8) && BootPhase > 0) { p2 += 8; - KdDebuggerEnabled = TRUE; KdDebugState |= KD_DEBUG_SERIAL | KD_DEBUG_KDSERIAL; } else if (!_strnicmp(p2, "KDNOECHO", 8) && BootPhase > 0) { p2 += 8; - KdDebuggerEnabled = TRUE; KdDebugState |= KD_DEBUG_KDNOECHO; } else if (!_strnicmp(p2, "DEBUG", 5) && BootPhase == 0) @@ -265,7 +258,7 @@ KdInit1(VOID) { /* Initialize kernel debugger (phase 0) */ - if ((KdDebuggerEnabled == TRUE) && + if ((KdDebuggerEnabled) && (KdDebugState & KD_DEBUG_GDB)) { KdGdbStubInit(0); @@ -277,7 +270,7 @@ KdInit2(VOID) { /* Initialize kernel debugger (phase 1) */ - if ((KdDebuggerEnabled == TRUE) && + if ((KdDebuggerEnabled) && (KdDebugState & KD_DEBUG_GDB)) { KdGdbStubInit(1);

19 years, 6 months

[blight] 14109: Allow mapping of MDLs which describe I/O memory (device memory) into usermode. I hope the changes are correct :-/

by blight＠svn.reactos.com

Allow mapping of MDLs which describe I/O memory (device memory) into usermode. I hope the changes are correct :-/ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-03-15 22:06:41 UTC (rev 14108) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-03-15 22:07:05 UTC (rev 14109) @@ -628,6 +628,7 @@ VOID MmSetLRULastPage(PFN_TYPE Page); VOID MmLockPage(PFN_TYPE Page); +VOID MmLockPageUnsafe(PFN_TYPE Page); VOID MmUnlockPage(PFN_TYPE Page); @@ -712,6 +713,7 @@ VOID MmDereferencePage(PFN_TYPE Page); VOID MmReferencePage(PFN_TYPE Page); +VOID MmReferencePageUnsafe(PFN_TYPE Page); BOOLEAN MmIsAccessedAndResetAccessPage(struct _EPROCESS* Process, PVOID Address); _____ Modified: trunk/reactos/ntoskrnl/mm/freelist.c --- trunk/reactos/ntoskrnl/mm/freelist.c 2005-03-15 22:06:41 UTC (rev 14108) +++ trunk/reactos/ntoskrnl/mm/freelist.c 2005-03-15 22:07:05 UTC (rev 14109) @@ -623,15 +623,15 @@ } VOID -MmReferencePage(PFN_TYPE Pfn) +MmReferencePageUnsafe(PFN_TYPE Pfn) { KIRQL oldIrql; - DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); + DPRINT("MmReferencePageUnsafe(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); if (Pfn == 0 || Pfn >= MmPageArraySize) { - KEBUGCHECK(0); + return; } KeAcquireSpinLock(&PageListLock, &oldIrql); @@ -646,6 +646,19 @@ KeReleaseSpinLock(&PageListLock, oldIrql); } +VOID +MmReferencePage(PFN_TYPE Pfn) +{ + DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); + + if (Pfn == 0 || Pfn >= MmPageArraySize) + { + KEBUGCHECK(0); + } + + MmReferencePageUnsafe(Pfn); +} + ULONG MmGetReferenceCountPage(PFN_TYPE Pfn) { @@ -792,15 +805,15 @@ } VOID -MmLockPage(PFN_TYPE Pfn) +MmLockPageUnsafe(PFN_TYPE Pfn) { KIRQL oldIrql; - DPRINT("MmLockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); + DPRINT("MmLockPageUnsafe(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); if (Pfn == 0 || Pfn >= MmPageArraySize) { - KEBUGCHECK(0); + return; } KeAcquireSpinLock(&PageListLock, &oldIrql); @@ -816,6 +829,19 @@ } VOID +MmLockPage(PFN_TYPE Pfn) +{ + DPRINT("MmLockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); + + if (Pfn == 0 || Pfn >= MmPageArraySize) + { + KEBUGCHECK(0); + } + + MmLockPageUnsafe(Pfn); +} + +VOID MmUnlockPage(PFN_TYPE Pfn) { KIRQL oldIrql; _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-03-15 22:06:41 UTC (rev 14108) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-03-15 22:07:05 UTC (rev 14109) @@ -29,7 +29,7 @@ /* MDL Flags desc. -MDL_PAGES_LOCKED MmProbelAndLockPages has been called for this mdl +MDL_PAGES_LOCKED MmProbeAndLockPages has been called for this mdl MDL_SOURCE_IS_NONPAGED_POOL mdl has been build by MmBuildMdlForNonPagedPool MDL_PARTIAL mdl has been built by IoBuildPartialMdl MDL_MAPPING_CAN_FAIL in case of an error, MmMapLockedPages will return NULL instead of to bugcheck @@ -233,7 +233,7 @@ /* Unmap all the pages. */ for (i = 0; i < PageCount; i++) { - MmDeleteVirtualMapping(NULL, + MmDeleteVirtualMapping(Mdl->Process, (char*)BaseAddress + (i * PAGE_SIZE), FALSE, NULL, @@ -300,7 +300,7 @@ { memcpy(Mdl + 1, Pages, sizeof(PFN_TYPE) * (PAGE_ROUND_UP(Mdl->ByteOffset+Mdl->ByteCount)/PAGE_SIZE)); - //FIXME: this flag should be set by the caller perhaps? + /* FIXME: this flag should be set by the caller perhaps? */ Mdl->MdlFlags |= MDL_IO_PAGE_READ; } @@ -375,8 +375,8 @@ ASSERT(NrPages <= (Mdl->Size - sizeof(MDL))/sizeof(PFN_TYPE)); - if (Mdl->StartVa >= (PVOID)KERNEL_BASE && - MmGetPfnForProcess(NULL, Mdl->StartVa) > MmPageArraySize) + if (Mdl->StartVa >= (PVOID)KERNEL_BASE && + MmGetPfnForProcess(NULL, Mdl->StartVa) >= MmPageArraySize) { /* phys addr is not phys memory so this must be io memory */ @@ -392,14 +392,14 @@ if (Mdl->StartVa >= (PVOID)KERNEL_BASE) { - //FIXME: why isn't AccessMode used? + /* FIXME: why isn't AccessMode used? */ Mode = KernelMode; Mdl->Process = NULL; AddressSpace = MmGetKernelAddressSpace(); } else { - //FIXME: why isn't AccessMode used? + /* FIXME: why isn't AccessMode used? */ Mode = UserMode; Mdl->Process = CurrentProcess; AddressSpace = &CurrentProcess->AddressSpace; @@ -430,8 +430,11 @@ for (j = 0; j < i; j++) { Page = MdlPages[j]; - MmUnlockPage(Page); - MmDereferencePage(Page); + if (Page < MmPageArraySize) + { + MmUnlockPage(Page); + MmDereferencePage(Page); + } } MmUnlockAddressSpace(AddressSpace); ExRaiseStatus(Status); @@ -451,8 +454,11 @@ for (j = 0; j < i; j++) { Page = MdlPages[j]; - MmUnlockPage(Page); - MmDereferencePage(Page); + if (Page < MmPageArraySize) + { + MmUnlockPage(Page); + MmDereferencePage(Page); + } } MmUnlockAddressSpace(AddressSpace); ExRaiseStatus(Status); @@ -460,7 +466,10 @@ } Page = MmGetPfnForProcess(NULL, Address); MdlPages[i] = Page; - MmReferencePage(Page); + if (Page >= MmPageArraySize) + Mdl->MdlFlags |= MDL_IO_SPACE; + else + MmReferencePage(Page); } MmUnlockAddressSpace(AddressSpace); @@ -843,6 +852,8 @@ } KeReleaseSpinLock(&MiMdlMappingRegionLock, oldIrql); + + Mdl->Process = NULL; } /* Set the virtual mappings for the MDL pages. */ @@ -853,11 +864,18 @@ Protect |= PAGE_NOCACHE; else if (CacheType == MmWriteCombined) DPRINT("CacheType MmWriteCombined not supported!\n"); - Status = MmCreateVirtualMapping(CurrentProcess, - Base, - Protect, - MdlPages, - PageCount); + if (Mdl->MdlFlags & MDL_IO_SPACE) + Status = MmCreateVirtualMappingUnsafe(CurrentProcess, + Base, + Protect, + MdlPages, + PageCount); + else + Status = MmCreateVirtualMapping(CurrentProcess, + Base, + Protect, + MdlPages, + PageCount); if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-03-15 22:06:41 UTC (rev 14108) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-03-15 22:07:05 UTC (rev 14109) @@ -727,6 +727,9 @@ MmSharePageEntrySectionSegment(Segment, Offset); + /* FIXME: Should we call MmCreateVirtualMappingUnsafe if + * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true? + */ Status = MmCreateVirtualMapping(MemoryArea->Process, Address, Attributes, @@ -829,14 +832,14 @@ * Just map the desired physical page */ Page = (Offset + MemoryArea->Data.SectionData.ViewOffset) >> PAGE_SHIFT; - Status = MmCreateVirtualMapping(AddressSpace->Process, - Address, - Region->Protect, - &Page, - 1); + Status = MmCreateVirtualMappingUnsafe(AddressSpace->Process, + Address, + Region->Protect, + &Page, + 1); if (!NT_SUCCESS(Status)) { - DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); + DPRINT("MmCreateVirtualMappingUnsafe failed, not out of memory\n"); KEBUGCHECK(0); return(Status); } @@ -846,7 +849,7 @@ */ if (Locked) { - MmLockPage(Page); + MmLockPageUnsafe(Page); } /*

19 years, 6 months

[navaraf] 14108: Don't access the Irp->User* fields in NpfsSignalAndRemoveListeningServerInstance. The I/O manager will safely do that for us.

by navaraf＠svn.reactos.com

Don't access the Irp->User* fields in NpfsSignalAndRemoveListeningServerInstance. The I/O manager will safely do that for us. Modified: trunk/reactos/drivers/fs/np/create.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-03-15 21:46:14 UTC (rev 14107) +++ trunk/reactos/drivers/fs/np/create.c 2005-03-15 22:06:41 UTC (rev 14108) @@ -87,9 +87,8 @@ { DPRINT("Server found! Fcb %p\n", Waiter->Fcb); - KeSetEvent(Waiter->Irp->UserEvent, 0, FALSE); - Waiter->Irp->UserIosb->Status = FILE_PIPE_CONNECTED_STATE; - Waiter->Irp->UserIosb->Information = 0; + Waiter->Irp->IoStatus.Status = FILE_PIPE_CONNECTED_STATE; + Waiter->Irp->IoStatus.Information = 0; IoCompleteRequest(Waiter->Irp, IO_NO_INCREMENT); RemoveEntryList(&Waiter->Entry);

19 years, 6 months

[gvg] 14107: Aric Stewart <aric@codeweavers.com>

by gvg＠svn.reactos.com

Aric Stewart <aric(a)codeweavers.com> - The values are quoted and spaces added, so having spaces in the properties results in spaces in the values which is incorrect. Modified: trunk/reactos/subsys/system/msiexec/msiexec.c _____ Modified: trunk/reactos/subsys/system/msiexec/msiexec.c --- trunk/reactos/subsys/system/msiexec/msiexec.c 2005-03-15 21:44:42 UTC (rev 14106) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2005-03-15 21:46:14 UTC (rev 14107) @@ -67,9 +67,9 @@ "Copyright 2004 Vincent BÚron\n"; static const WCHAR ActionAdmin[] = { - 'A','C','T','I','O','N','=','A','D','M','I','N',' ',0 }; + 'A','C','T','I','O','N','=','A','D','M','I','N',0 }; static const WCHAR RemoveAll[] = { - 'R','E','M','O','V','E','=','A','L','L',' ',0 }; + 'R','E','M','O','V','E','=','A','L','L',0 }; static const WCHAR InstallRunOnce[] = { 'S','o','f','t','w','a','r','e','\\',

19 years, 6 months

[gvg] 14106: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Jeremy White <jwhite(a)codeweavers.com> - Aggressively round up to the proper alignment when reporting position on streams where we are converting up. - When we are converting from one sample rate to another, we do have to adjust when calculating TIME_SAMPLES. Alex Villacis Lasso <a_villacis(a)palosanto.com> - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all resources, so that Spanish locales other than Spain also use Spanish resources. Robert Reif <reif(a)earthlink.net> - Added parameter checking to timeGetDevCaps. - Added timer tests. Christian Costa <titan.costa(a)wanadoo.fr> - Added some more cases to MCI_MapMsgAtoW. - Fixed offsets calculations. Modified: trunk/reactos/lib/winmm/mci.c Modified: trunk/reactos/lib/winmm/time.c Modified: trunk/reactos/lib/winmm/wavemap/wavemap.c Modified: trunk/reactos/lib/winmm/winmm_Es.rc _____ Modified: trunk/reactos/lib/winmm/mci.c --- trunk/reactos/lib/winmm/mci.c 2005-03-15 21:39:07 UTC (rev 14105) +++ trunk/reactos/lib/winmm/mci.c 2005-03-15 21:44:42 UTC (rev 14106) @@ -278,6 +278,11 @@ case MCI_UPDATE: case MCI_RESUME: case MCI_DELETE: + case MCI_MONITOR: + case MCI_SETAUDIO: + case MCI_SIGNAL: + case MCI_SETVIDEO: + case MCI_LIST: return 0; case MCI_OPEN: @@ -975,8 +980,8 @@ */ static DWORD MCI_GetReturnType(LPCWSTR lpCmd) { - lpCmd += strlenW(lpCmd) + 1 + sizeof(DWORD) + sizeof(WORD); - if (*lpCmd == '\0' && *(const WORD*)(lpCmd + 1 + sizeof(DWORD)) == MCI_RETURN) { + lpCmd = (LPCWSTR)((BYTE*)(lpCmd + strlenW(lpCmd) + 1) + sizeof(DWORD) + sizeof(WORD)); + if (*lpCmd == '\0' && *(const WORD*)((BYTE*)(lpCmd + 1) + sizeof(DWORD)) == MCI_RETURN) { return *(const DWORD*)(lpCmd + 1); } return 0L; _____ Modified: trunk/reactos/lib/winmm/time.c --- trunk/reactos/lib/winmm/time.c 2005-03-15 21:39:07 UTC (rev 14105) +++ trunk/reactos/lib/winmm/time.c 2005-03-15 21:44:42 UTC (rev 14106) @@ -408,9 +408,19 @@ { TRACE("(%p, %u)\n", lpCaps, wSize); + if (lpCaps == 0) { + WARN("invalid lpCaps\n"); + return TIMERR_NOCANDO; + } + + if (wSize < sizeof(TIMECAPS)) { + WARN("invalid wSize\n"); + return TIMERR_NOCANDO; + } + lpCaps->wPeriodMin = MMSYSTIME_MININTERVAL; lpCaps->wPeriodMax = MMSYSTIME_MAXINTERVAL; - return 0; + return TIMERR_NOERROR; } /*********************************************************************** *** _____ Modified: trunk/reactos/lib/winmm/wavemap/wavemap.c --- trunk/reactos/lib/winmm/wavemap/wavemap.c 2005-03-15 21:39:07 UTC (rev 14105) +++ trunk/reactos/lib/winmm/wavemap/wavemap.c 2005-03-15 21:44:42 UTC (rev 14106) @@ -62,6 +62,9 @@ /* ratio to compute position from a PCM playback to any format */ DWORD avgSpeedOuter; DWORD avgSpeedInner; + /* channel size of inner and outer */ + DWORD nSamplesPerSecOuter; + DWORD nSamplesPerSecInner; } WAVEMAPDATA; static BOOL WAVEMAP_IsData(WAVEMAPDATA* wm) @@ -177,6 +180,7 @@ wom->dwClientInstance = lpDesc->dwInstance; wom->u.out.hOuterWave = (HWAVEOUT)lpDesc->hWave; wom->avgSpeedOuter = wom->avgSpeedInner = lpDesc->lpFormat->nAvgBytesPerSec; + wom->nSamplesPerSecOuter = wom->nSamplesPerSecInner = lpDesc->lpFormat->nSamplesPerSec; for (i = ndlo; i < ndhi; i++) { /* if no ACM stuff is involved, no need to handle callbacks at this @@ -198,7 +202,7 @@ #define TRY(sps,bps) wfx.nSamplesPerSec = (sps); wfx.wBitsPerSample = (bps); \ switch (res=wodOpenHelper(wom, i, lpDesc, &wfx, dwFlags | WAVE_FORMAT_DIRECT)) { \ - case MMSYSERR_NOERROR: wom->avgSpeedInner = wfx.nAvgBytesPerSec; goto found; \ + case MMSYSERR_NOERROR: wom->avgSpeedInner = wfx.nAvgBytesPerSec; wom->nSamplesPerSecInner = wfx.nSamplesPerSec; goto found; \ case WAVERR_BADFORMAT: break; \ default: goto error; \ } @@ -414,12 +418,59 @@ static DWORD wodGetPosition(WAVEMAPDATA* wom, LPMMTIME lpTime, DWORD dwParam2) { DWORD val; + MMTIME timepos; TRACE("(%p %p %08lx)\n", wom, lpTime, dwParam2); - val = waveOutGetPosition(wom->u.out.hInnerWave, lpTime, dwParam2); - if (lpTime->wType == TIME_BYTES) - lpTime->u.cb = MulDiv(lpTime->u.cb, wom->avgSpeedOuter, wom->avgSpeedInner); - /* other time types don't require conversion */ + memcpy(&timepos, lpTime, sizeof(timepos)); + + /* For TIME_MS, we're going to recalculate using TIME_BYTES */ + if (lpTime->wType == TIME_MS) + timepos.wType = TIME_BYTES; + + val = waveOutGetPosition(wom->u.out.hInnerWave, &timepos, dwParam2); + + if (lpTime->wType == TIME_BYTES || lpTime->wType == TIME_MS) + { + DWORD dwInnerSamplesPerOuter = wom->nSamplesPerSecInner / wom->nSamplesPerSecOuter; + if (dwInnerSamplesPerOuter > 0) + { + DWORD dwInnerBytesPerSample = wom->avgSpeedInner / wom->nSamplesPerSecInner; + DWORD dwInnerBytesPerOuterSample = dwInnerBytesPerSample * dwInnerSamplesPerOuter; + DWORD remainder = 0; + + /* If we are up sampling (going from lower sample rate to higher), + ** we need to make a special accomodation for times when we've + ** written a partial output sample. This happens frequently + ** to us because we use msacm to do our up sampling, and it + ** will up sample on an unaligned basis. + ** For example, if you convert a 2 byte wide 8,000 'outer' + ** buffer to a 2 byte wide 48,000 inner device, you would + ** expect 2 bytes of input to produce 12 bytes of output. + ** Instead, msacm will produce 8 bytes of output. + ** But reporting our position as 1 byte of output is + ** nonsensical; the output buffer position needs to be + ** aligned on outer sample size, and aggressively rounded up. + */ + remainder = timepos.u.cb % dwInnerBytesPerOuterSample; + if (remainder > 0) + { + timepos.u.cb -= remainder; + timepos.u.cb += dwInnerBytesPerOuterSample; + } + } + + lpTime->u.cb = MulDiv(timepos.u.cb, wom->avgSpeedOuter, wom->avgSpeedInner); + + /* Once we have the TIME_BYTES right, we can easily convert to TIME_MS */ + if (lpTime->wType == TIME_MS) + lpTime->u.cb = MulDiv(lpTime->u.cb, 1000, wom->avgSpeedOuter); + } + else if (lpTime->wType == TIME_SAMPLES) + lpTime->u.cb = MulDiv(timepos.u.cb, wom->nSamplesPerSecOuter, wom->nSamplesPerSecInner); + else + /* other time types don't require conversion */ + lpTime->u = timepos.u; + return val; } @@ -691,6 +742,7 @@ } wim->avgSpeedOuter = wim->avgSpeedInner = lpDesc->lpFormat->nAvgBytesPerSec; + wim->nSamplesPerSecOuter = wim->nSamplesPerSecInner = lpDesc->lpFormat->nSamplesPerSec; for (i = ndlo; i < ndhi; i++) { if (waveInOpen(&wim->u.in.hInnerWave, i, lpDesc->lpFormat, (DWORD)widCallback, @@ -710,7 +762,7 @@ #define TRY(sps,bps) wfx.nSamplesPerSec = (sps); wfx.wBitsPerSample = (bps); \ switch (res=widOpenHelper(wim, i, lpDesc, &wfx, dwFlags | WAVE_FORMAT_DIRECT)) { \ - case MMSYSERR_NOERROR: wim->avgSpeedInner = wfx.nAvgBytesPerSec; goto found; \ + case MMSYSERR_NOERROR: wim->avgSpeedInner = wfx.nAvgBytesPerSec; wim->nSamplesPerSecInner = wfx.nSamplesPerSec; goto found; \ case WAVERR_BADFORMAT: break; \ default: goto error; \ } @@ -915,6 +967,8 @@ val = waveInGetPosition(wim->u.in.hInnerWave, lpTime, dwParam2); if (lpTime->wType == TIME_BYTES) lpTime->u.cb = MulDiv(lpTime->u.cb, wim->avgSpeedOuter, wim->avgSpeedInner); + if (lpTime->wType == TIME_SAMPLES) + lpTime->u.cb = MulDiv(lpTime->u.cb, wim->nSamplesPerSecOuter, wim->nSamplesPerSecInner); /* other time types don't require conversion */ return val; } _____ Modified: trunk/reactos/lib/winmm/winmm_Es.rc --- trunk/reactos/lib/winmm/winmm_Es.rc 2005-03-15 21:39:07 UTC (rev 14105) +++ trunk/reactos/lib/winmm/winmm_Es.rc 2005-03-15 21:44:42 UTC (rev 14106) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL BEGIN /* MMSYS errors */

19 years, 6 months

← Newer
1
...
26
27
28
29
30
31
32
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005