Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 50051: [CMAKE] - Improve mciwave.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 17 13:54:13 2010 New Revision: 50051 URL: http://svn.reactos.org/svn/reactos?rev=50051&view=rev Log: [CMAKE] - Improve mciwave. Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… ============================================================================== --- branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] Fri Dec 17 13:54:13 2010 @@ -8,16 +8,14 @@ spec2def(mciwave.dll mciwave.spec) -add_library(mciwave SHARED mciwave.c mciwave.def) - -if(NOT MSVC) - set_source_files_properties(mciwave.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(mciwave SHARED + mciwave.c + ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def) set_entrypoint(mciwave 0) target_link_libraries(mciwave wine) +add_importlibs(mciwave user32 winmm msvcrt kernel32 ntdll) -add_importlibs(mciwave winmm user32 msvcrt kernel32 ntdll) add_dependencies(mciwave psdk buildno_header) add_cab_target(mciwave 1)

14 years, 4 months

[akhaldi] 50050: [CMAKE] - Fix msacm32.dll entry point. This fixes the World Peace issue, I mean, bootcd and livecd userinit exception issue. We get to the shell now in both. Thanks to Johannes for...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 17 13:45:27 2010 New Revision: 50050 URL: http://svn.reactos.org/svn/reactos?rev=50050&view=rev Log: [CMAKE] - Fix msacm32.dll entry point. This fixes the World Peace issue, I mean, bootcd and livecd userinit exception issue. We get to the shell now in both. Thanks to Johannes for helping me investigate this. Modified: branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Fri Dec 17 13:45:27 2010 @@ -19,12 +19,15 @@ add_library(msacm32 SHARED ${SOURCE}) -set_module_type(msacm32 win32dll) +set_entrypoint(msacm32 DllMain@12) +set_image_base(msacm32 ${baseaddress_msacm32}) target_link_libraries(msacm32 wine) add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) +add_dependencies(msacm32 psdk buildno_header) + add_subdirectory(msacm32.drv) add_cab_target(msacm32 1) add_importlib_target(msacm32.spec)

14 years, 4 months

[greatlrd] 50049: [dxg.sys] it build now again with the stub

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Dec 17 12:12:35 2010 New Revision: 50049 URL: http://svn.reactos.org/svn/reactos?rev=50049&view=rev Log: [dxg.sys] it build now again with the stub Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h branches/reactx/reactos/drivers/directx/dxg/dxg_int.h branches/reactx/reactos/drivers/directx/dxg/main.c branches/reactx/reactos/drivers/directx/dxg/stub.c Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_driver.h [iso-8859-1] Fri Dec 17 12:12:35 2010 @@ -2,97 +2,97 @@ DRVFN gaDxgFuncs [] = { - {DXG_INDEX_DxDxgGenericThunk, (PFN)DxDxgGenericThunk}, - //{DXG_INDEX_DxD3dContextCreate, (PFN)DxD3dContextCreate}, - //{DXG_INDEX_DxD3dContextDestroy, (PFN)DxD3dContextDestroy}, - //{DXG_INDEX_DxD3dContextDestroyAll, (PFN)DxD3dContextDestroyAll}, - //{DXG_INDEX_DxD3dValidateTextureStageState, (PFN)DxD3dValidateTextureStageState}, - //{DXG_INDEX_DxD3dDrawPrimitives2, (PFN)DxD3dDrawPrimitives2}, - //{DXG_INDEX_DxDdGetDriverState, (PFN)DxDdGetDriverState}, - //{DXG_INDEX_DxDdAddAttachedSurface, (PFN)DxDdAddAttachedSurface}, - //{DXG_INDEX_DxDdAlphaBlt, (PFN)DxDdAlphaBlt}, - //{DXG_INDEX_DxDdAttachSurface, (PFN)DxDdAttachSurface}, - //{DXG_INDEX_DxDdBeginMoCompFrame, (PFN)DxDdBeginMoCompFrame}, - //{DXG_INDEX_DxDdBlt, (PFN)DxDdBlt}, - //{DXG_INDEX_DxDdCanCreateSurface, (PFN)DxDdCanCreateSurface}, - //{DXG_INDEX_DxDdCanCreateD3DBuffer, (PFN)DxDdCanCreateD3DBuffer}, - //{DXG_INDEX_DxDdColorControl, (PFN)DxDdColorControl}, - //{DXG_INDEX_DxDdCreateDirectDrawObject, (PFN)DxDdCreateDirectDrawObject}, - //{DXG_INDEX_DxDdCreateSurface, (PFN)DxDdCreateD3DBuffer}, - //{DXG_INDEX_DxDdCreateD3DBuffer, (PFN)DxDdCreateD3DBuffer}, - //{DXG_INDEX_DxDdCreateMoComp, (PFN)DxDdCreateMoComp}, - //{DXG_INDEX_DxDdCreateSurfaceObject, (PFN)DxDdCreateSurfaceObject}, - //{DXG_INDEX_DxDdDeleteDirectDrawObject, (PFN)DxDdDeleteDirectDrawObject}, - //{DXG_INDEX_DxDdDeleteSurfaceObject, (PFN)DxDdDeleteSurfaceObject}, - //{DXG_INDEX_DxDdDestroyMoComp, (PFN)DxDdDestroyMoComp}, - //{DXG_INDEX_DxDdDestroySurface, (PFN)DxDdDestroySurface}, - //{DXG_INDEX_DxDdDestroyD3DBuffer, (PFN)DxDdDestroyD3DBuffer}, - //{DXG_INDEX_DxDdEndMoCompFrame, (PFN)DxDdEndMoCompFrame}, - //{DXG_INDEX_DxDdFlip, (PFN)DxDdFlip}, - //{DXG_INDEX_DxDdFlipToGDISurface, (PFN)DxDdFlipToGDISurface}, - //{DXG_INDEX_DxDdGetAvailDriverMemory, (PFN)DxDdGetAvailDriverMemory}, - //{DXG_INDEX_DxDdGetBltStatus, (PFN)DxDdGetBltStatus}, - //{DXG_INDEX_DxDdGetDC, (PFN)DxDdGetDC}, - //{DXG_INDEX_DxDdGetDriverInfo, (PFN)DxDdGetDriverInfo}, - //{DXG_INDEX_DxDdGetDxHandle, (PFN)DxDdGetDxHandle}, - //{DXG_INDEX_DxDdGetFlipStatus, (PFN)DxDdGetFlipStatus}, - //{DXG_INDEX_DxDdGetInternalMoCompInfo, (PFN)DxDdGetInternalMoCompInfo}, - //{DXG_INDEX_DxDdGetMoCompBuffInfo, (PFN)DxDdGetMoCompBuffInfo}, - //{DXG_INDEX_DxDdGetMoCompGuids, (PFN)DxDdGetMoCompGuids}, - //{DXG_INDEX_DxDdGetMoCompFormats, (PFN)DxDdGetMoCompFormats}, - //{DXG_INDEX_DxDdGetScanLine, (PFN)DxDdGetScanLine}, - //{DXG_INDEX_DxDdLock, (PFN)DxDdLock}, - //{DXG_INDEX_DxDdLockD3D, (PFN)DxDdLockD3D}, - //{DXG_INDEX_DxDdQueryDirectDrawObject, (PFN)DxDdQueryDirectDrawObject}, - //{DXG_INDEX_DxDdQueryMoCompStatus, (PFN)DxDdQueryMoCompStatus}, - //{DXG_INDEX_DxDdReenableDirectDrawObject, (PFN)DxDdReenableDirectDrawObject}, - //{DXG_INDEX_DxDdReleaseDC, (PFN)DxDdReleaseDC}, - //{DXG_INDEX_DxDdRenderMoComp, (PFN)DxDdRenderMoComp}, - //{DXG_INDEX_DxDdResetVisrgn, (PFN)DxDdResetVisrgn}, - //{DXG_INDEX_DxDdSetColorKey, (PFN)DxDdSetColorKey}, - //{DXG_INDEX_DxDdSetExclusiveMode, (PFN)DxDdSetExclusiveMode}, - //{DXG_INDEX_DxDdSetGammaRamp, (PFN)DxDdSetGammaRamp}, - //{DXG_INDEX_DxDdCreateSurfaceEx, (PFN)DxDdCreateSurfaceEx}, - //{DXG_INDEX_DxDdSetOverlayPosition, (PFN)DxDdSetOverlayPosition}, - //{DXG_INDEX_DxDdUnattachSurface, (PFN)DxDdUnattachSurface}, - //{DXG_INDEX_DxDdUnlock, (PFN)DxDdUnlock}, - //{DXG_INDEX_DxDdUnlockD3D2, (PFN)DxDdUnlockD3D}, - //{DXG_INDEX_DxDdUpdateOverlay, (PFN)DxDdUpdateOverlay}, - //{DXG_INDEX_DxDdWaitForVerticalBlank, (PFN)DxDdWaitForVerticalBlank}, - //{DXG_INDEX_DxDvpCanCreateVideoPort, (PFN)DxDvpCanCreateVideoPort}, - //{DXG_INDEX_DxDvpColorControl, (PFN)DxDvpColorControl}, - //{DXG_INDEX_DxDvpCreateVideoPort, (PFN)DxDvpCreateVideoPort}, - //{DXG_INDEX_DxDvpDestroyVideoPort, (PFN)DxDvpDestroyVideoPort}, - //{DXG_INDEX_DxDvpFlipVideoPort, (PFN)DxDvpFlipVideoPort}, - //{DXG_INDEX_DxDvpGetVideoPortBandwidth, (PFN)DxDvpGetVideoPortBandwidth}, - //{DXG_INDEX_DxDvpGetVideoPortField, (PFN)DxDvpGetVideoPortField}, - //{DXG_INDEX_DxDvpGetVideoPortFlipStatus, (PFN)DxDvpGetVideoPortFlipStatus}, - //{DXG_INDEX_DxDvpGetVideoPortInputFormats, (PFN)DxDvpGetVideoPortInputFormats}, - //{DXG_INDEX_DxDvpGetVideoPortLine, (PFN)DxDvpGetVideoPortLine}, - //{DXG_INDEX_DxDvpGetVideoPortOutputFormats, (PFN)DxDvpGetVideoPortOutputFormats}, - //{DXG_INDEX_DxDvpGetVideoPortConnectInfo, (PFN)DxDvpGetVideoPortConnectInfo}, - //{DXG_INDEX_DxDvpGetVideoSignalStatus, (PFN)DxDvpGetVideoSignalStatus}, - //{DXG_INDEX_DxDvpUpdateVideoPort, (PFN)DxDvpUpdateVideoPort}, - //{DXG_INDEX_DxDvpWaitForVideoPortSync, (PFN)DxDvpWaitForVideoPortSync}, - //{DXG_INDEX_DxDvpAcquireNotification, (PFN)DxDvpAcquireNotification}, - //{DXG_INDEX_DxDvpReleaseNotification, (PFN)DxDvpReleaseNotification}, - //{DXG_INDEX_DxDdHeapVidMemAllocAligned, (PFN)DxDdHeapVidMemAllocAligned}, - //{DXG_INDEX_DxDdHeapVidMemFree, (PFN)DxDdHeapVidMemFree}, - //{DXG_INDEX_DxDdEnableDirectDraw, (PFN)DxDdEnableDirectDraw}, - //{DXG_INDEX_DxDdDisableDirectDraw, (PFN)DxDdDisableDirectDraw}, - //{DXG_INDEX_DxDdSuspendDirectDraw, (PFN)DxDdSuspendDirectDraw}, - //{DXG_INDEX_DxDdResumeDirectDraw, (PFN)DxDdResumeDirectDraw}, - //{DXG_INDEX_DxDdDynamicModeChange, (PFN)DxDdDynamicModeChange}, - //{DXG_INDEX_DxDdCloseProcess, (PFN)DxDdCloseProcess}, - //{DXG_INDEX_DxDdGetDirectDrawBound, (PFN)DxDdGetDirectDrawBound}, - //{DXG_INDEX_DxDdEnableDirectDrawRedirection, (PFN)DxDdEnableDirectDrawRedirection}, - //{DXG_INDEX_DxDdAllocPrivateUserMem, (PFN)DxDdAllocPrivateUserMem}, - //{DXG_INDEX_DxDdFreePrivateUserMem, (PFN)DxDdFreePrivateUserMem}, - {DXG_INDEX_DxDdLockDirectDrawSurface, (PFN)DxDdLockDirectDrawSurface}, - {DXG_INDEX_DxDdUnlockDirectDrawSurface, (PFN)DxDdUnlockDirectDrawSurface}, - //{DXG_INDEX_DxDdSetAccelLevel, (PFN)DxDdSetAccelLevel}, - //{DXG_INDEX_DxDdGetSurfaceLock, (PFN)DxDdGetSurfaceLock}, - //{DXG_INDEX_DxDdEnumLockedSurfaceRect, (PFN)DxDdEnumLockedSurfaceRect}, - {DXG_INDEX_DxDdIoctl, (PFN)DxDdIoctl} + {DXG_INDEX_DXDXGGENERICTHUNK, (PFN)DxDxgGenericThunk}, + {DXG_INDEX_DXD3DCONTEXTCREATE, (PFN)DxD3dContextCreate}, + {DXG_INDEX_DXD3DCONTEXTDESTROY, (PFN)DxD3dContextDestroy}, + {DXG_INDEX_DXD3DCONTEXTDESTROYALL, (PFN)DxD3dContextDestroyAll}, + {DXG_INDEX_DXD3DVALIDATETEXTURESTAGESTATE, (PFN)DxD3dValidateTextureStageState}, + {DXG_INDEX_DXD3DDRAWPRIMITIVES2, (PFN)DxD3dDrawPrimitives2}, + {DXG_INDEX_DXDDGETDRIVERSTATE, (PFN)DxDdGetDriverState}, + {DXG_INDEX_DXDDADDATTACHEDSURFACE, (PFN)DxDdAddAttachedSurface}, + {DXG_INDEX_DXDDALPHABLT, (PFN)DxDdAlphaBlt}, + {DXG_INDEX_DXDDATTACHSURFACE, (PFN)DxDdAttachSurface}, + {DXG_INDEX_DXDDBEGINMOCOMPFRAME, (PFN)DxDdBeginMoCompFrame}, + {DXG_INDEX_DXDDBLT, (PFN)DxDdBlt}, + {DXG_INDEX_DXDDCANCREATESURFACE, (PFN)DxDdCanCreateSurface}, + {DXG_INDEX_DXDDCANCREATED3DBUFFER, (PFN)DxDdCanCreateD3DBuffer}, + {DXG_INDEX_DXDDCOLORCONTROL, (PFN)DxDdColorControl}, + {DXG_INDEX_DXDDCREATEDIRECTDRAWOBJECT, (PFN)DxDdCreateDirectDrawObject}, + {DXG_INDEX_DXDDCREATESURFACE, (PFN)DxDdCreateSurface}, + {DXG_INDEX_DXDDCREATED3DBUFFER, (PFN)DxDdCreateSurface}, + {DXG_INDEX_DXDDCREATEMOCOMP, (PFN)DxDdCreateMoComp}, + {DXG_INDEX_DXDDCREATESURFACEOBJECT, (PFN)DxDdCreateSurfaceObject}, + {DXG_INDEX_DXDDDELETEDIRECTDRAWOBJECT, (PFN)DxDdDeleteDirectDrawObject}, + {DXG_INDEX_DXDDDELETESURFACEOBJECT, (PFN)DxDdDeleteSurfaceObject}, + {DXG_INDEX_DXDDDESTROYMOCOMP, (PFN)DxDdDestroyMoComp}, + {DXG_INDEX_DXDDDESTROYSURFACE, (PFN)DxDdDestroySurface}, + {DXG_INDEX_DXDDDESTROYD3DBUFFER, (PFN)DxDdDestroyD3DBuffer}, + {DXG_INDEX_DXDDENDMOCOMPFRAME, (PFN)DxDdEndMoCompFrame}, + {DXG_INDEX_DXDDFLIP, (PFN)DxDdFlip}, + {DXG_INDEX_DXDDFLIPTOGDISURFACE, (PFN)DxDdFlipToGDISurface}, + {DXG_INDEX_DXDDGETAVAILDRIVERMEMORY, (PFN)DxDdGetAvailDriverMemory}, + {DXG_INDEX_DXDDGETBLTSTATUS, (PFN)DxDdGetBltStatus}, + {DXG_INDEX_DXDDGETDC, (PFN)DxDdGetDC}, + {DXG_INDEX_DXDDGETDRIVERINFO, (PFN)DxDdGetDriverInfo}, + {DXG_INDEX_DXDDGETDXHANDLE, (PFN)DxDdGetDxHandle}, + {DXG_INDEX_DXDDGETFLIPSTATUS, (PFN)DxDdGetFlipStatus}, + {DXG_INDEX_DXDDGETINTERNALMOCOMPINFO, (PFN)DxDdGetInternalMoCompInfo}, + {DXG_INDEX_DXDDGETMOCOMPBUFFINFO, (PFN)DxDdGetMoCompBuffInfo}, + {DXG_INDEX_DXDDGETMOCOMPGUIDS, (PFN)DxDdGetMoCompGuids}, + {DXG_INDEX_DXDDGETMOCOMPFORMATS, (PFN)DxDdGetMoCompFormats}, + {DXG_INDEX_DXDDGETSCANLINE, (PFN)DxDdGetScanLine}, + {DXG_INDEX_DXDDLOCK, (PFN)DxDdLock}, + {DXG_INDEX_DXDDLOCKD3D, (PFN)DxDdLockD3D}, + {DXG_INDEX_DXDDQUERYDIRECTDRAWOBJECT, (PFN)DxDdQueryDirectDrawObject}, + {DXG_INDEX_DXDDQUERYMOCOMPSTATUS, (PFN)DxDdQueryMoCompStatus}, + {DXG_INDEX_DXDDREENABLEDIRECTDRAWOBJECT, (PFN)DxDdReenableDirectDrawObject}, + {DXG_INDEX_DXDDRELEASEDC, (PFN)DxDdReleaseDC}, + {DXG_INDEX_DXDDRENDERMOCOMP, (PFN)DxDdRenderMoComp}, + {DXG_INDEX_DXDDRESETVISRGN, (PFN)DxDdResetVisrgn}, + {DXG_INDEX_DXDDSETCOLORKEY, (PFN)DxDdSetColorKey}, + {DXG_INDEX_DXDDSETEXCLUSIVEMODE, (PFN)DxDdSetExclusiveMode}, + {DXG_INDEX_DXDDSETGAMMARAMP, (PFN)DxDdSetGammaRamp}, + {DXG_INDEX_DXDDCREATESURFACEEX, (PFN)DxDdCreateSurfaceEx}, + {DXG_INDEX_DXDDSETOVERLAYPOSITION, (PFN)DxDdSetOverlayPosition}, + {DXG_INDEX_DXDDUNATTACHSURFACE, (PFN)DxDdUnattachSurface}, + {DXG_INDEX_DXDDUNLOCK, (PFN)DxDdUnlock}, + {DXG_INDEX_DXDDUNLOCKD3D, (PFN)DxDdUnlock}, + {DXG_INDEX_DXDDUPDATEOVERLAY, (PFN)DxDdUpdateOverlay}, + {DXG_INDEX_DXDDWAITFORVERTICALBLANK, (PFN)DxDdWaitForVerticalBlank}, + {DXG_INDEX_DXDVPCANCREATEVIDEOPORT, (PFN)DxDvpCanCreateVideoPort}, + {DXG_INDEX_DXDVPCOLORCONTROL, (PFN)DxDvpColorControl}, + {DXG_INDEX_DXDVPCREATEVIDEOPORT, (PFN)DxDvpCreateVideoPort}, + {DXG_INDEX_DXDVPDESTROYVIDEOPORT, (PFN)DxDvpDestroyVideoPort}, + {DXG_INDEX_DXDVPFLIPVIDEOPORT, (PFN)DxDvpFlipVideoPort}, + {DXG_INDEX_DXDVPGETVIDEOPORTBANDWIDTH, (PFN)DxDvpGetVideoPortBandwidth}, + {DXG_INDEX_DXDVPGETVIDEOPORTFIELD, (PFN)DxDvpGetVideoPortField}, + {DXG_INDEX_DXDVPGETVIDEOPORTFLIPSTATUS, (PFN)DxDvpGetVideoPortFlipStatus}, + {DXG_INDEX_DXDVPGETVIDEOPORTINPUTFORMATS, (PFN)DxDvpGetVideoPortInputFormats}, + {DXG_INDEX_DXDVPGETVIDEOPORTLINE, (PFN)DxDvpGetVideoPortLine}, + {DXG_INDEX_DXDVPGETVIDEOPORTOUTPUTFORMATS, (PFN)DxDvpGetVideoPortOutputFormats}, + {DXG_INDEX_DXDVPGETVIDEOPORTCONNECTINFO, (PFN)DxDvpGetVideoPortConnectInfo}, + {DXG_INDEX_DXDVPGETVIDEOSIGNALSTATUS, (PFN)DxDvpGetVideoSignalStatus}, + {DXG_INDEX_DXDVPUPDATEVIDEOPORT, (PFN)DxDvpUpdateVideoPort}, + {DXG_INDEX_DXDVPWAITFORVIDEOPORTSYNC, (PFN)DxDvpWaitForVideoPortSync}, + {DXG_INDEX_DXDVPACQUIRENOTIFICATION, (PFN)DxDvpAcquireNotification}, + {DXG_INDEX_DXDVPRELEASENOTIFICATION, (PFN)DxDvpReleaseNotification}, + {DXG_INDEX_DXDDHEAPVIDMEMALLOCALIGNED, (PFN)DxDdHeapVidMemAllocAligned}, + {DXG_INDEX_DXDDHEAPVIDMEMFREE, (PFN)DxDdHeapVidMemFree}, + {DXG_INDEX_DXDDENABLEDIRECTDRAW, (PFN)DxDdEnableDirectDraw}, + {DXG_INDEX_DXDDDISABLEDIRECTDRAW, (PFN)DxDdDisableDirectDraw}, + {DXG_INDEX_DXDDSUSPENDDIRECTDRAW, (PFN)DxDdSuspendDirectDraw}, + {DXG_INDEX_DXDDRESUMEDIRECTDRAW, (PFN)DxDdResumeDirectDraw}, + {DXG_INDEX_DXDDDYNAMICMODECHANGE, (PFN)DxDdDynamicModeChange}, + {DXG_INDEX_DXDDCLOSEPROCESS, (PFN)DxDdCloseProcess}, + {DXG_INDEX_DXDDGETDIRECTDRAWBOUND, (PFN)DxDdGetDirectDrawBound}, + {DXG_INDEX_DXDDENABLEDIRECTDRAWREDIRECTION, (PFN)DxDdEnableDirectDrawRedirection}, + {DXG_INDEX_DXDDALLOCPRIVATEUSERMEM, (PFN)DxDdAllocPrivateUserMem}, + {DXG_INDEX_DXDDFREEPRIVATEUSERMEM, (PFN)DxDdFreePrivateUserMem}, + {DXG_INDEX_DXDDLOCKDIRECTDRAWSURFACE, (PFN)DxDdLockDirectDrawSurface}, + {DXG_INDEX_DXDDUNLOCKDIRECTDRAWSURFACE, (PFN)DxDdUnlockDirectDrawSurface}, + {DXG_INDEX_DXDDSETACCELLEVEL, (PFN)DxDdSetAccelLevel}, + {DXG_INDEX_DXDDGETSURFACELOCK, (PFN)DxDdGetSurfaceLock}, + {DXG_INDEX_DXDDENUMLOCKEDSURFACERECT, (PFN)DxDdEnumLockedSurfaceRect}, + {DXG_INDEX_DXDDIOCTL, (PFN)DxDdIoctl} }; Modified: branches/reactx/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] Fri Dec 17 12:12:35 2010 @@ -96,6 +96,95 @@ PDD_SURFACE_LOCAL NTAPI DxDdLockDirectDrawSurface(HANDLE hDdSurface); BOOL NTAPI DxDdUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface); +NTSTATUS NTAPI DxDdEnableDirectDraw(PVOID pDev, BOOLEAN Enable); +NTSTATUS NTAPI DxD3dContextCreate(DWORD x1, DWORD x2, DWORD x3, DWORD x4); +NTSTATUS NTAPI DxD3dContextDestroy(DWORD x1); +NTSTATUS NTAPI DxD3dContextDestroyAll(DWORD x1); +NTSTATUS NTAPI DxD3dValidateTextureStageState(DWORD x1); +NTSTATUS NTAPI DxD3dDrawPrimitives2(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7); +NTSTATUS NTAPI DxDdGetDriverState(DWORD x1); +NTSTATUS NTAPI DxDdAddAttachedSurface(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdAlphaBlt(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdAttachSurface(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdBeginMoCompFrame(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdBlt(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdCanCreateSurface(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdCanCreateD3DBuffer(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdColorControl(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdCreateDirectDrawObject(DWORD x1); +NTSTATUS NTAPI DxDdCreateSurface(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7, DWORD x8); +NTSTATUS NTAPI DxDdCreateMoComp(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdCreateSurfaceObject(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6); +NTSTATUS NTAPI DxDdDeleteDirectDrawObject(DWORD x1); +NTSTATUS NTAPI DxDdDeleteSurfaceObject(DWORD x1); +NTSTATUS NTAPI DxDdDestroyMoComp(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdDestroySurface(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdDestroyD3DBuffer(DWORD x1); +NTSTATUS NTAPI DxDdEndMoCompFrame(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdFlip(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); +NTSTATUS NTAPI DxDdFlipToGDISurface(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetAvailDriverMemory(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetBltStatus(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetDC(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetDriverInfo(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetDxHandle(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdGetFlipStatus(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetInternalMoCompInfo(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetMoCompBuffInfo(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetMoCompGuids(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetMoCompFormats(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetScanLine(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdLock(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdLockD3D(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdQueryDirectDrawObject(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7, DWORD x8, DWORD x9 , DWORD x10 , DWORD x11); +NTSTATUS NTAPI DxDdQueryMoCompStatus(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdReenableDirectDrawObject(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdReleaseDC(DWORD x1); +NTSTATUS NTAPI DxDdRenderMoComp(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdResetVisrgn(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdSetColorKey(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdSetExclusiveMode(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdSetGammaRamp(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdCreateSurfaceEx(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdSetOverlayPosition(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdUnattachSurface(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdUnlock(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdUpdateOverlay(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdWaitForVerticalBlank(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpCanCreateVideoPort(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpColorControl(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpCreateVideoPort(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpDestroyVideoPort(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpFlipVideoPort(DWORD x1, DWORD x2, DWORD x3, DWORD x4); +NTSTATUS NTAPI DxDvpGetVideoPortBandwidth(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpGetVideoPortField(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpGetVideoPortFlipStatus(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpGetVideoPortInputFormats(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpGetVideoPortLine(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpGetVideoPortOutputFormats(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpGetVideoPortConnectInfo(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpGetVideoSignalStatus(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpUpdateVideoPort(DWORD x1, DWORD x2, DWORD x3, DWORD x4); +NTSTATUS NTAPI DxDvpWaitForVideoPortSync(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDvpAcquireNotification(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDvpReleaseNotification(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdHeapVidMemAllocAligned(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5); +NTSTATUS NTAPI DxDdHeapVidMemFree(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdDisableDirectDraw(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdSuspendDirectDraw(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdResumeDirectDraw(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdDynamicModeChange(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdCloseProcess(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdGetDirectDrawBound(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdEnableDirectDrawRedirection(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdAllocPrivateUserMem(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdFreePrivateUserMem(DWORD x1, DWORD x2); +NTSTATUS NTAPI DxDdSetAccelLevel(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdGetSurfaceLock(DWORD x1); +NTSTATUS NTAPI DxDdEnumLockedSurfaceRect(DWORD x1, DWORD x2, DWORD x3); +NTSTATUS NTAPI DxDdEnableDirectDraw(PVOID pDev, BOOLEAN Enable); + + /* Internal functions */ BOOL FASTCALL VerifyObjectOwner(PDD_ENTRY pEntry); BOOL FASTCALL DdHmgCreate(VOID); Modified: branches/reactx/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/main.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/main.c [iso-8859-1] Fri Dec 17 12:12:35 2010 @@ -12,7 +12,7 @@ #include <dxg_int.h> #include "dxg_driver.h" -#define DXG_DRIVER_VERSION 0x80000 +#define DXG_DRIVER_VERSION 0x80000 LONG gcDummyPageRefCnt = 0; HSEMAPHORE ghsemDummyPage = NULL; @@ -22,7 +22,7 @@ PDRVFN gpEngFuncs; -const ULONG gcDxgFuncs = DXG_INDEX_DxDdIoctl + 1; +const ULONG gcDxgFuncs = DXG_INDEX_LAST; @@ -138,3 +138,6 @@ return STATUS_SUCCESS; } + + + Modified: branches/reactx/reactos/drivers/directx/dxg/stub.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/stub.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/stub.c [iso-8859-1] Fri Dec 17 12:12:35 2010 @@ -10,9 +10,9 @@ #include <dxg_int.h> -#include "dxg_driver.h" - -#define stub DPRINT1("UNIMPLEMENT"); / +#include <debug.h> + +#define stub UNIMPLEMENTED \ return DDERR_UNSUPPORTED; @@ -81,7 +81,7 @@ NTSTATUS NTAPI -DxDdBeginMoCompFrame)(DWORD x1, DWORD x2) +DxDdBeginMoCompFrame(DWORD x1, DWORD x2) { stub; } @@ -102,7 +102,7 @@ NTSTATUS NTAPI -DxDdCanCreateD3DBuffer)( +DxDdCanCreateD3DBuffer(DWORD x1, DWORD x2) { stub; } @@ -138,7 +138,7 @@ NTSTATUS NTAPI -DxDdCreateSurfaceObject(DWORD x1, DWORD x2, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +DxDdCreateSurfaceObject(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6) { stub; } @@ -159,7 +159,7 @@ NTSTATUS NTAPI -DxDdDestroyMoComp)(DWORD x1, DWORD x2) +DxDdDestroyMoComp(DWORD x1, DWORD x2) { stub; }

14 years, 4 months

[greatlrd] 50048: fix some dxg index value from lower case to upper case

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Dec 17 10:45:15 2010 New Revision: 50048 URL: http://svn.reactos.org/svn/reactos?rev=50048&view=rev Log: fix some dxg index value from lower case to upper case Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h [iso-8859-1] Fri Dec 17 10:45:15 2010 @@ -7,82 +7,82 @@ /***************************************************************************/ /* This driver functions are exported raw from NtGdiDd* / NtDvp* / NtD3d* */ /***************************************************************************/ -#define DXG_INDEX_DxDxgGenericThunk 0x00 -#define DXG_INDEX_DxD3dContextCreate 0x01 -#define DXG_INDEX_DxD3dContextDestroy 0x02 -#define DXG_INDEX_DxD3dContextDestroyAll 0x03 -#define DXG_INDEX_DxD3dValidateTextureStageState 0x04 -#define DXG_INDEX_DxD3dDrawPrimitives2 0x05 -#define DXG_INDEX_DxDdGetDriverState 0x06 -#define DXG_INDEX_DxDdAddAttachedSurface 0x07 -#define DXG_INDEX_DxDdAlphaBlt 0x08 -#define DXG_INDEX_DxDdAttachSurface 0x09 -#define DXG_INDEX_DxDdBeginMoCompFrame 0x0A -#define DXG_INDEX_DxDdBlt 0x0B -#define DXG_INDEX_DxDdCanCreateSurface 0x0C -#define DXG_INDEX_DxDdCanCreateD3DBuffer 0x0D -#define DXG_INDEX_DxDdColorControl 0x0E -#define DXG_INDEX_DxDdCreateDirectDrawObject 0x0F +#define DXG_INDEX_DXDXGGENERICTHUNK 0X00 +#define DXG_INDEX_DXD3DCONTEXTCREATE 0X01 +#define DXG_INDEX_DXD3DCONTEXTDESTROY 0X02 +#define DXG_INDEX_DXD3DCONTEXTDESTROYALL 0X03 +#define DXG_INDEX_DXD3DVALIDATETEXTURESTAGESTATE 0X04 +#define DXG_INDEX_DXD3DDRAWPRIMITIVES2 0X05 +#define DXG_INDEX_DXDDGETDRIVERSTATE 0X06 +#define DXG_INDEX_DXDDADDATTACHEDSURFACE 0X07 +#define DXG_INDEX_DXDDALPHABLT 0X08 +#define DXG_INDEX_DXDDATTACHSURFACE 0X09 +#define DXG_INDEX_DXDDBEGINMOCOMPFRAME 0X0A +#define DXG_INDEX_DXDDBLT 0X0B +#define DXG_INDEX_DXDDCANCREATESURFACE 0X0C +#define DXG_INDEX_DXDDCANCREATED3DBUFFER 0X0D +#define DXG_INDEX_DXDDCOLORCONTROL 0X0E +#define DXG_INDEX_DXDDCREATEDIRECTDRAWOBJECT 0X0F /* DXG_INDEX_DxDdCreateSurface and DXG_INDEX_DxDdCreateD3DBuffer2 are same */ -#define DXG_INDEX_DxDdCreateSurface 0x10 -#define DXG_INDEX_DxDdCreateD3DBuffer 0x11 -#define DXG_INDEX_DxDdCreateMoComp 0x12 -#define DXG_INDEX_DxDdCreateSurfaceObject 0x13 -#define DXG_INDEX_DxDdDeleteDirectDrawObject 0x14 -#define DXG_INDEX_DxDdDeleteSurfaceObject 0x15 -#define DXG_INDEX_DxDdDestroyMoComp 0x16 -#define DXG_INDEX_DxDdDestroySurface 0x17 -#define DXG_INDEX_DxDdDestroyD3DBuffer 0x18 -#define DXG_INDEX_DxDdEndMoCompFrame 0x19 -#define DXG_INDEX_DxDdFlip 0x1A -#define DXG_INDEX_DxDdFlipToGDISurface 0x1B -#define DXG_INDEX_DxDdGetAvailDriverMemory 0x1C -#define DXG_INDEX_DxDdGetBltStatus 0x1D -#define DXG_INDEX_DxDdGetDC 0x1E -#define DXG_INDEX_DxDdGetDriverInfo 0x1F -#define DXG_INDEX_DxDdGetDxHandle 0x20 -#define DXG_INDEX_DxDdGetFlipStatus 0x21 -#define DXG_INDEX_DxDdGetInternalMoCompInfo 0x22 -#define DXG_INDEX_DxDdGetMoCompBuffInfo 0x23 -#define DXG_INDEX_DxDdGetMoCompGuids 0x24 -#define DXG_INDEX_DxDdGetMoCompFormats 0x25 -#define DXG_INDEX_DxDdGetScanLine 0x26 -#define DXG_INDEX_DxDdLock 0x27 -#define DXG_INDEX_DxDdLockD3D 0x28 -#define DXG_INDEX_DxDdQueryDirectDrawObject 0x29 -#define DXG_INDEX_DxDdQueryMoCompStatus 0x2A -#define DXG_INDEX_DxDdReenableDirectDrawObject 0x2B -#define DXG_INDEX_DxDdReleaseDC 0x2C -#define DXG_INDEX_DxDdRenderMoComp 0x2D -#define DXG_INDEX_DxDdResetVisrgn 0x2E -#define DXG_INDEX_DxDdSetColorKey 0x2F -#define DXG_INDEX_DxDdSetExclusiveMode 0x30 -#define DXG_INDEX_DxDdSetGammaRamp 0x31 -#define DXG_INDEX_DxDdCreateSurfaceEx 0x32 -#define DXG_INDEX_DxDdSetOverlayPosition 0x33 -#define DXG_INDEX_DxDdUnattachSurface 0x34 +#define DXG_INDEX_DXDDCREATESURFACE 0X10 +#define DXG_INDEX_DXDDCREATED3DBUFFER 0X11 +#define DXG_INDEX_DXDDCREATEMOCOMP 0X12 +#define DXG_INDEX_DXDDCREATESURFACEOBJECT 0X13 +#define DXG_INDEX_DXDDDELETEDIRECTDRAWOBJECT 0X14 +#define DXG_INDEX_DXDDDELETESURFACEOBJECT 0X15 +#define DXG_INDEX_DXDDDESTROYMOCOMP 0X16 +#define DXG_INDEX_DXDDDESTROYSURFACE 0X17 +#define DXG_INDEX_DXDDDESTROYD3DBUFFER 0X18 +#define DXG_INDEX_DXDDENDMOCOMPFRAME 0X19 +#define DXG_INDEX_DXDDFLIP 0X1A +#define DXG_INDEX_DXDDFLIPTOGDISURFACE 0X1B +#define DXG_INDEX_DXDDGETAVAILDRIVERMEMORY 0X1C +#define DXG_INDEX_DXDDGETBLTSTATUS 0X1D +#define DXG_INDEX_DXDDGETDC 0X1E +#define DXG_INDEX_DXDDGETDRIVERINFO 0X1F +#define DXG_INDEX_DXDDGETDXHANDLE 0X20 +#define DXG_INDEX_DXDDGETFLIPSTATUS 0X21 +#define DXG_INDEX_DXDDGETINTERNALMOCOMPINFO 0X22 +#define DXG_INDEX_DXDDGETMOCOMPBUFFINFO 0X23 +#define DXG_INDEX_DXDDGETMOCOMPGUIDS 0X24 +#define DXG_INDEX_DXDDGETMOCOMPFORMATS 0X25 +#define DXG_INDEX_DXDDGETSCANLINE 0X26 +#define DXG_INDEX_DXDDLOCK 0X27 +#define DXG_INDEX_DXDDLOCKD3D 0X28 +#define DXG_INDEX_DXDDQUERYDIRECTDRAWOBJECT 0X29 +#define DXG_INDEX_DXDDQUERYMOCOMPSTATUS 0X2A +#define DXG_INDEX_DXDDREENABLEDIRECTDRAWOBJECT 0X2B +#define DXG_INDEX_DXDDRELEASEDC 0X2C +#define DXG_INDEX_DXDDRENDERMOCOMP 0X2D +#define DXG_INDEX_DXDDRESETVISRGN 0X2E +#define DXG_INDEX_DXDDSETCOLORKEY 0X2F +#define DXG_INDEX_DXDDSETEXCLUSIVEMODE 0X30 +#define DXG_INDEX_DXDDSETGAMMARAMP 0X31 +#define DXG_INDEX_DXDDCREATESURFACEEX 0X32 +#define DXG_INDEX_DXDDSETOVERLAYPOSITION 0X33 +#define DXG_INDEX_DXDDUNATTACHSURFACE 0X34 /* DXG_INDEX_DxDdUnlock and DXG_INDEX_DxDdUnlockD3D are same */ -#define DXG_INDEX_DxDdUnlock 0x35 -#define DXG_INDEX_DxDdUnlockD3D 0x36 -#define DXG_INDEX_DxDdUpdateOverlay 0x37 -#define DXG_INDEX_DxDdWaitForVerticalBlank 0x38 -#define DXG_INDEX_DxDvpCanCreateVideoPort 0x39 -#define DXG_INDEX_DxDvpColorControl 0x3A -#define DXG_INDEX_DxDvpCreateVideoPort 0x3B -#define DXG_INDEX_DxDvpDestroyVideoPort 0x3C -#define DXG_INDEX_DxDvpFlipVideoPort 0x3D -#define DXG_INDEX_DxDvpGetVideoPortBandwidth 0x3E -#define DXG_INDEX_DxDvpGetVideoPortField 0x3F -#define DXG_INDEX_DxDvpGetVideoPortFlipStatus 0x40 -#define DXG_INDEX_DxDvpGetVideoPortInputFormats 0x41 -#define DXG_INDEX_DxDvpGetVideoPortLine 0x42 -#define DXG_INDEX_DxDvpGetVideoPortOutputFormats 0x43 -#define DXG_INDEX_DxDvpGetVideoPortConnectInfo 0x44 -#define DXG_INDEX_DxDvpGetVideoSignalStatus 0x45 -#define DXG_INDEX_DxDvpUpdateVideoPort 0x46 -#define DXG_INDEX_DxDvpWaitForVideoPortSync 0x47 -#define DXG_INDEX_DxDvpAcquireNotification 0x48 -#define DXG_INDEX_DxDvpReleaseNotification 0x49 +#define DXG_INDEX_DXDDUNLOCK 0X35 +#define DXG_INDEX_DXDDUNLOCKD3D 0X36 +#define DXG_INDEX_DXDDUPDATEOVERLAY 0X37 +#define DXG_INDEX_DXDDWAITFORVERTICALBLANK 0X38 +#define DXG_INDEX_DXDVPCANCREATEVIDEOPORT 0X39 +#define DXG_INDEX_DXDVPCOLORCONTROL 0X3A +#define DXG_INDEX_DXDVPCREATEVIDEOPORT 0X3B +#define DXG_INDEX_DXDVPDESTROYVIDEOPORT 0X3C +#define DXG_INDEX_DXDVPFLIPVIDEOPORT 0X3D +#define DXG_INDEX_DXDVPGETVIDEOPORTBANDWIDTH 0X3E +#define DXG_INDEX_DXDVPGETVIDEOPORTFIELD 0X3F +#define DXG_INDEX_DXDVPGETVIDEOPORTFLIPSTATUS 0X40 +#define DXG_INDEX_DXDVPGETVIDEOPORTINPUTFORMATS 0X41 +#define DXG_INDEX_DXDVPGETVIDEOPORTLINE 0X42 +#define DXG_INDEX_DXDVPGETVIDEOPORTOUTPUTFORMATS 0X43 +#define DXG_INDEX_DXDVPGETVIDEOPORTCONNECTINFO 0X44 +#define DXG_INDEX_DXDVPGETVIDEOSIGNALSTATUS 0X45 +#define DXG_INDEX_DXDVPUPDATEVIDEOPORT 0X46 +#define DXG_INDEX_DXDVPWAITFORVIDEOPORTSYNC 0X47 +#define DXG_INDEX_DXDVPACQUIRENOTIFICATION 0X48 +#define DXG_INDEX_DXDVPRELEASENOTIFICATION 0X49 /***********************************************************************************/ /* This driver functions are exported raw from Eng* it only exists in the def file */ @@ -90,38 +90,38 @@ /* for them are in the export list */ /***********************************************************************************/ /* not addedd yet */ -#define DXG_INDEX_DxDdHeapVidMemAllocAligned 0x4A -#define DXG_INDEX_DxDdHeapVidMemFree 0x4B -#define DXG_INDEX_DxDdAllocPrivateUserMem 0x54 -#define DXG_INDEX_DxDdFreePrivateUserMem 0x55 -#define DXG_INDEX_DxDdLockDirectDrawSurface 0x56 -#define DXG_INDEX_DxDdUnlockDirectDrawSurface 0x57 -#define DXG_INDEX_DxDdIoctl 0x5B +#define DXG_INDEX_DXDDHEAPVIDMEMALLOCALIGNED 0X4A +#define DXG_INDEX_DXDDHEAPVIDMEMFREE 0X4B +#define DXG_INDEX_DXDDALLOCPRIVATEUSERMEM 0X54 +#define DXG_INDEX_DXDDFREEPRIVATEUSERMEM 0X55 +#define DXG_INDEX_DXDDLOCKDIRECTDRAWSURFACE 0X56 +#define DXG_INDEX_DXDDUNLOCKDIRECTDRAWSURFACE 0X57 +#define DXG_INDEX_DXDDIOCTL 0X5B /***********************************************************************************/ /* Internal use in diffent part in Windows and ReactOS */ /***********************************************************************************/ /* not inuse yet */ -#define DXG_INDEX_DxDdEnableDirectDraw 0x4C -#define DXG_INDEX_DxDdDisableDirectDraw 0x4D -#define DXG_INDEX_DxDdSuspendDirectDraw 0x4E -#define DXG_INDEX_DxDdResumeDirectDraw 0x4F -#define DXG_INDEX_DxDdDynamicModeChange 0x50 -#define DXG_INDEX_DxDdCloseProcess 0x51 -#define DXG_INDEX_DxDdGetDirectDrawBound 0x52 -#define DXG_INDEX_DxDdEnableDirectDrawRedirection 0x53 -#define DXG_INDEX_DxDdSetAccelLevel 0x58 -#define DXG_INDEX_DxDdGetSurfaceLock 0x59 -#define DXG_INDEX_DxDdEnumLockedSurfaceRect 0x5A -#define DXG_INDEX_DxDdIoctl 0x5B -#define DXG_INDEX_DxDdSwitchToGDI 0x5C +#define DXG_INDEX_DXDDENABLEDIRECTDRAW 0X4C +#define DXG_INDEX_DXDDDISABLEDIRECTDRAW 0X4D +#define DXG_INDEX_DXDDSUSPENDDIRECTDRAW 0X4E +#define DXG_INDEX_DXDDRESUMEDIRECTDRAW 0X4F +#define DXG_INDEX_DXDDDYNAMICMODECHANGE 0X50 +#define DXG_INDEX_DXDDCLOSEPROCESS 0X51 +#define DXG_INDEX_DXDDGETDIRECTDRAWBOUND 0X52 +#define DXG_INDEX_DXDDENABLEDIRECTDRAWREDIRECTION 0X53 +#define DXG_INDEX_DXDDSETACCELLEVEL 0X58 +#define DXG_INDEX_DXDDGETSURFACELOCK 0X59 +#define DXG_INDEX_DXDDENUMLOCKEDSURFACERECT 0X5A +#define DXG_INDEX_DXDDIOCTL 0X5B +#define DXG_INDEX_DXDDSWITCHTOGDI 0X5C +#define DXG_INDEX_LAST DXG_INDEX_DXDDSWITCHTOGDI + 1 /***********************************************************************************/ /* Driver Functions Protypes */ /***********************************************************************************/ -typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); //typedef x (NTAPI *PGD_DxD3dContextCreate)( //typedef x (NTAPI *PGD_DxD3dContextDestroy)( //typedef x (NTAPI *PGD_DxD3dContextDestroyAll)( @@ -197,7 +197,6 @@ //typedef x (NTAPI *PGD_DxDvpReleaseNotification)( //typedef x (NTAPI *PGD_DxDdHeapVidMemAllocAligned)( //typedef x (NTAPI *PGD_DxDdHeapVidMemFree)( -typedef BOOLEAN (NTAPI *PGD_DXDDENABLEDIRECTDRAW)(PVOID, BOOLEAN); //typedef x (NTAPI *PGD_DxDdDisableDirectDraw)( //typedef x (NTAPI *PGD_DxDdSuspendDirectDraw)( //typedef x (NTAPI *PGD_DxDdResumeDirectDraw)( @@ -207,11 +206,14 @@ //typedef x (NTAPI *PGD_DxDdEnableDirectDrawRedirection)( //typedef x (NTAPI *PGD_DxDdAllocPrivateUserMem)( //typedef x (NTAPI *PGD_DxDdFreePrivateUserMem)( -typedef PDD_SURFACE_LOCAL (NTAPI *PGD_DxDdLockDirectDrawSurface)(HANDLE hDdSurface); -typedef BOOL (NTAPI *PGD_DxDdUnlockDirectDrawSurface)(HANDLE hDdSurface); //typedef x (NTAPI *PGD_DxDdSetAccelLevel)( //typedef x (NTAPI *PGD_DxDdGetSurfaceLock)( //typedef x (NTAPI *PGD_DxDdEnumLockedSurfaceRect)( + +typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); +typedef BOOLEAN (NTAPI *PGD_DXDDENABLEDIRECTDRAW)(PVOID, BOOLEAN); +typedef PDD_SURFACE_LOCAL (NTAPI *PGD_DXDDLOCKDIRECTDRAWSURFACE)(HANDLE hDdSurface); +typedef BOOL (NTAPI *PGD_DXDDUNLOCKDIRECTDRAWSURFACE)(HANDLE hDdSurface); typedef DWORD (NTAPI *PGD_ENGDXIOCTL)(ULONG, PVOID, ULONG);

14 years, 4 months

[jimtabor] 50047: [Win32k|User32] - Finish 50030 (work by Giannis), Now PostMessage passes all the correct data based on Get/PeekMessage. Example: Post A, Get/Peek A, Translate A, Dispatch A, shoul...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 17 01:09:42 2010 New Revision: 50047 URL: http://svn.reactos.org/svn/reactos?rev=50047&view=rev Log: [Win32k|User32] - Finish 50030 (work by Giannis), Now PostMessage passes all the correct data based on Get/PeekMessage. Example: Post A, Get/Peek A, Translate A, Dispatch A, should be that simple. FYI: DDE memory handling should be in win32k not user32 and why,,,,, ~see next point~ - Patch up problems (at a minimum) going into the SendMessage/Timeout A2U U2A support in win32k and fixed SMTO callback if local. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Fri Dec 17 01:09:42 2010 @@ -116,7 +116,6 @@ typedef struct _USER32_THREAD_DATA { - MSG LastMessage; USER32_TRACKINGLIST tracking_info; /* TrackMouseEvent stuff */ } USER32_THREAD_DATA, *PUSER32_THREAD_DATA; Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Fri Dec 17 01:09:42 2010 @@ -145,7 +145,8 @@ return Ret; } -static BOOL FASTCALL +static +BOOL FASTCALL MsgiUMToKMMessage(PMSG UMMsg, PMSG KMMsg, BOOL Posted) { *KMMsg = *UMMsg; @@ -249,7 +250,8 @@ return TRUE; } -static VOID FASTCALL +static +VOID FASTCALL MsgiUMToKMCleanup(PMSG UMMsg, PMSG KMMsg) { switch (KMMsg->message) @@ -949,9 +951,7 @@ WINAPI GetMessagePos(VOID) { - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); - return(MAKELONG(ThreadData->LastMessage.pt.x, ThreadData->LastMessage.pt.y)); - //return NtUserCallNoParam(NOPARAM_ROUTINE_GETMSESSAGEPOS); + return NtUserCallNoParam(NOPARAM_ROUTINE_GETMSESSAGEPOS); } @@ -961,9 +961,7 @@ LONG WINAPI GetMessageTime(VOID) { - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); - return(ThreadData->LastMessage.time); -// return NtUserGetThreadState(THREADSTATE_GETMESSAGETIME); + return NtUserGetThreadState(THREADSTATE_GETMESSAGETIME); } @@ -1602,17 +1600,17 @@ UINT wMsgFilterMax) { BOOL Res; - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); + + if ( (wMsgFilterMin|wMsgFilterMax) & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } Res = NtUserGetMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); if (-1 == (int) Res) { return Res; - } - - if (Res && lpMsg->message != WM_PAINT && lpMsg->message != WM_QUIT) - { - ThreadData->LastMessage = *lpMsg; } return Res; @@ -1628,7 +1626,12 @@ UINT wMsgFilterMax) { BOOL Res; - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); + + if ( (wMsgFilterMin|wMsgFilterMax) & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } Res = NtUserGetMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); if (-1 == (int) Res) @@ -1636,20 +1639,15 @@ return Res; } - if (Res && lpMsg->message != WM_PAINT && lpMsg->message != WM_QUIT) - { - ThreadData->LastMessage = *lpMsg; - } - return Res; } BOOL WINAPI -PeekMessageWorker(PMSG pMsg, - HWND hWnd, - UINT wMsgFilterMin, - UINT wMsgFilterMax, - UINT wRemoveMsg) +PeekMessageWorker( PMSG pMsg, + HWND hWnd, + UINT wMsgFilterMin, + UINT wMsgFilterMax, + UINT wRemoveMsg) { PCLIENTINFO pci; PCLIENTTHREADINFO pcti; @@ -1692,17 +1690,11 @@ UINT wRemoveMsg) { BOOL Res; - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); Res = PeekMessageWorker(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); if (-1 == (int) Res || !Res) { return FALSE; - } - - if (Res && lpMsg->message != WM_PAINT && lpMsg->message != WM_QUIT) - { - ThreadData->LastMessage = *lpMsg; } return Res; @@ -1722,7 +1714,6 @@ UINT wRemoveMsg) { BOOL Res; - PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); Res = PeekMessageWorker(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); if (-1 == (int) Res || !Res) @@ -1730,44 +1721,7 @@ return FALSE; } - if (Res && lpMsg->message != WM_PAINT && lpMsg->message != WM_QUIT) - { - ThreadData->LastMessage = *lpMsg; - } - return Res; -} - -// -// Worker function for post message. -// -BOOL -FASTCALL -PostMessageWorker( - HWND Wnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - MSG UMMsg, KMMsg; - LRESULT Result; - - UMMsg.hwnd = Wnd; - UMMsg.message = Msg; - UMMsg.wParam = wParam; - UMMsg.lParam = lParam; - if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) - { - return FALSE; - } - Result = NtUserPostMessage( Wnd, - KMMsg.message, - KMMsg.wParam, - KMMsg.lParam); - - MsgiUMToKMCleanup(&UMMsg, &KMMsg); - - return Result; } /* @@ -1781,24 +1735,38 @@ WPARAM wParam, LPARAM lParam) { - MSG AnsiMsg, UcMsg; - BOOL Ret; - - AnsiMsg.hwnd = hWnd; - AnsiMsg.message = Msg; - AnsiMsg.wParam = wParam; - AnsiMsg.lParam = lParam; - - if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) - { - return FALSE; - } - - Ret = PostMessageW( hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam); - - MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - - return Ret; + LRESULT Ret; + + /* Check for combo box or a list box to send names. */ + if (Msg == CB_DIR || Msg == LB_DIR) + { + /* + Set DDL_POSTMSGS, so use the PostMessage function to send messages to the + combo/list box. Forces a call like DlgDirListComboBox. + */ + //wParam |= DDL_POSTMSGS; + return NtUserPostMessage(hWnd, Msg, wParam, lParam); + } + + /* No drop files or current Process, just post message. */ + if ( (Msg != WM_DROPFILES) || + ( NtUserQueryWindow( hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID) == + PtrToUint(NtCurrentTeb()->ClientId.UniqueProcess) ) ) + { + return NtUserPostMessage(hWnd, Msg, wParam, lParam); + } + + /* We have drop files and this is not the same process for this window. */ + + /* Just incase, check wParam for Global memory handle and send size. */ + Ret = SendMessageA( hWnd, + WM_COPYGLOBALDATA, + (WPARAM)GlobalSize((HGLOBAL)wParam), // Zero if not a handle. + (LPARAM)wParam); // Send wParam as lParam. + + if ( Ret ) return NtUserPostMessage(hWnd, Msg, (WPARAM)Ret, lParam); + + return FALSE; } /* @@ -1821,8 +1789,8 @@ Set DDL_POSTMSGS, so use the PostMessage function to send messages to the combo/list box. Forces a call like DlgDirListComboBox. */ - wParam |= DDL_POSTMSGS; - return PostMessageWorker(hWnd, Msg, wParam, lParam); + //wParam |= DDL_POSTMSGS; + return NtUserPostMessage(hWnd, Msg, wParam, lParam); } /* No drop files or current Process, just post message. */ @@ -1830,7 +1798,7 @@ ( NtUserQueryWindow( hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID) == PtrToUint(NtCurrentTeb()->ClientId.UniqueProcess) ) ) { - return PostMessageWorker(hWnd, Msg, wParam, lParam); + return NtUserPostMessage(hWnd, Msg, wParam, lParam); } /* We have drop files and this is not the same process for this window. */ @@ -1841,7 +1809,7 @@ (WPARAM)GlobalSize((HGLOBAL)wParam), // Zero if not a handle. (LPARAM)wParam); // Send wParam as lParam. - if ( Ret ) return PostMessageWorker(hWnd, Msg, (WPARAM)Ret, lParam); + if ( Ret ) return NtUserPostMessage(hWnd, Msg, (WPARAM)Ret, lParam); return FALSE; } @@ -1902,11 +1870,16 @@ PWND Window; PTHREADINFO ti = GetW32ThreadInfo(); - Window = ValidateHwnd(Wnd); - if (!Window) return FALSE; + if ( Msg & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { + Window = ValidateHwnd(Wnd); + if ( Window != NULL && Window->head.pti == ti && // !IsThreadHooked(GetWin32ClientInfo()) && // Enable to test message system bug. @@ -1937,7 +1910,7 @@ return FALSE; } - Result = NtUserMessageCall( KMMsg.hwnd, + Result = NtUserMessageCall( Wnd, KMMsg.message, KMMsg.wParam, KMMsg.lParam, @@ -1962,11 +1935,16 @@ PWND Window; PTHREADINFO ti = GetW32ThreadInfo(); - Window = ValidateHwnd(Wnd); - if (!Window) return FALSE; + if ( Msg & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { + Window = ValidateHwnd(Wnd); + if ( Window != NULL && Window->head.pti == ti && // !IsThreadHooked(GetWin32ClientInfo()) && // Enable to test message system bug. @@ -2003,7 +1981,7 @@ return FALSE; } - Result = NtUserMessageCall( KMMsg.hwnd, + Result = NtUserMessageCall( Wnd, KMMsg.message, KMMsg.wParam, KMMsg.lParam, @@ -2047,7 +2025,7 @@ return FALSE; } - Result = NtUserMessageCall( UcMsg.hwnd, + Result = NtUserMessageCall( hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam, @@ -2104,8 +2082,8 @@ MSG AnsiMsg, UcMsg; LRESULT Result; DOSENDMESSAGE dsm; - - SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); + PWND Window; + PTHREADINFO ti = GetW32ThreadInfo(); if ( Msg & ~WM_MAXIMUM || fuFlags & ~(SMTO_NOTIMEOUTIFNOTHUNG|SMTO_ABORTIFHUNG|SMTO_BLOCK)) { @@ -2114,6 +2092,23 @@ } if (lpdwResult) *lpdwResult = 0; + + if (hWnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) + { + Window = ValidateHwnd(hWnd); + + if ( Window != NULL && + Window->head.pti == ti && + !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROCRET) && + !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) + { + Result = IntCallMessageProc(Window, hWnd, Msg, wParam, lParam, TRUE); + if (lpdwResult) *lpdwResult = Result; + return TRUE; + } + } + SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); dsm.uFlags = fuFlags; dsm.uTimeout = uTimeout; @@ -2128,7 +2123,7 @@ return FALSE; } - Result = NtUserMessageCall( UcMsg.hwnd, + Result = NtUserMessageCall( hWnd, UcMsg.message, UcMsg.wParam, UcMsg.lParam, @@ -2162,8 +2157,8 @@ { LRESULT Result; DOSENDMESSAGE dsm; - - SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); + PWND Window; + PTHREADINFO ti = GetW32ThreadInfo(); if ( Msg & ~WM_MAXIMUM || fuFlags & ~(SMTO_NOTIMEOUTIFNOTHUNG|SMTO_ABORTIFHUNG|SMTO_BLOCK)) { @@ -2172,6 +2167,23 @@ } if (lpdwResult) *lpdwResult = 0; + + if (hWnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) + { + Window = ValidateHwnd(hWnd); + + if ( Window != NULL && + Window->head.pti == ti && + !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROCRET) && + !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) + { + Result = IntCallMessageProc(Window, hWnd, Msg, wParam, lParam, FALSE); + if (lpdwResult) *lpdwResult = Result; + return TRUE; + } + } + SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); dsm.uFlags = fuFlags; dsm.uTimeout = uTimeout; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Fri Dec 17 01:09:42 2010 @@ -61,6 +61,7 @@ { WM_STYLECHANGED, sizeof(STYLESTRUCT), MMS_FLAG_READ }, { WM_STYLECHANGING, sizeof(STYLESTRUCT), MMS_FLAG_READWRITE }, { WM_COPYDATA, MMS_SIZE_SPECIAL, MMS_FLAG_READ }, + { WM_COPYGLOBALDATA, MMS_SIZE_WPARAM, MMS_FLAG_READ }, { WM_WINDOWPOSCHANGED, sizeof(WINDOWPOS), MMS_FLAG_READ }, { WM_WINDOWPOSCHANGING, sizeof(WINDOWPOS), MMS_FLAG_READWRITE }, }; @@ -134,10 +135,6 @@ Size = sizeof(COPYDATASTRUCT) + ((PCOPYDATASTRUCT)lParam)->cbData; break; - case WM_COPYGLOBALDATA: - Size = wParam; - break; - default: ASSERT(FALSE); Size = 0; @@ -243,7 +240,6 @@ ASSERT(CsData == (PCHAR) PackedCs + Size); *lParamPacked = (LPARAM) PackedCs; } - else if (PoolType == NonPagedPool) { PMSGMEMORY MsgMemoryEntry; @@ -315,6 +311,100 @@ ASSERT(FALSE); return STATUS_INVALID_PARAMETER; +} + +static NTSTATUS FASTCALL +CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEntry) +{ + NTSTATUS Status; + + PVOID KernelMem; + UINT Size; + + *KernelModeMsg = *UserModeMsg; + + /* See if this message type is present in the table */ + if (NULL == MsgMemoryEntry) + { + /* Not present, no copying needed */ + return STATUS_SUCCESS; + } + + /* Determine required size */ + Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); + + if (0 != Size) + { + /* Allocate kernel mem */ + KernelMem = ExAllocatePoolWithTag(PagedPool, Size, TAG_MSG); + if (NULL == KernelMem) + { + DPRINT1("Not enough memory to copy message to kernel mem\n"); + return STATUS_NO_MEMORY; + } + KernelModeMsg->lParam = (LPARAM) KernelMem; + + /* Copy data if required */ + if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) + { + Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); + ExFreePoolWithTag(KernelMem, TAG_MSG); + return Status; + } + } + else + { + /* Make sure we don't pass any secrets to usermode */ + RtlZeroMemory(KernelMem, Size); + } + } + else + { + KernelModeMsg->lParam = 0; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS FASTCALL +CopyMsgToUserMem(MSG *UserModeMsg, MSG *KernelModeMsg) +{ + NTSTATUS Status; + PMSGMEMORY MsgMemoryEntry; + UINT Size; + + /* See if this message type is present in the table */ + MsgMemoryEntry = FindMsgMemory(UserModeMsg->message); + if (NULL == MsgMemoryEntry) + { + /* Not present, no copying needed */ + return STATUS_SUCCESS; + } + + /* Determine required size */ + Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); + + if (0 != Size) + { + /* Copy data if required */ + if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_WRITE)) + { + Status = MmCopyToCaller((PVOID) UserModeMsg->lParam, (PVOID) KernelModeMsg->lParam, Size); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to copy message from kernel: invalid usermode buffer\n"); + ExFreePool((PVOID) KernelModeMsg->lParam); + return Status; + } + } + + ExFreePool((PVOID) KernelModeMsg->lParam); + } + + return STATUS_SUCCESS; } // @@ -654,100 +744,6 @@ return TRUE; } -static NTSTATUS FASTCALL -CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEntry) -{ - NTSTATUS Status; - - PVOID KernelMem; - UINT Size; - - *KernelModeMsg = *UserModeMsg; - - /* See if this message type is present in the table */ - if (NULL == MsgMemoryEntry) - { - /* Not present, no copying needed */ - return STATUS_SUCCESS; - } - - /* Determine required size */ - Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); - - if (0 != Size) - { - /* Allocate kernel mem */ - KernelMem = ExAllocatePoolWithTag(PagedPool, Size, TAG_MSG); - if (NULL == KernelMem) - { - DPRINT1("Not enough memory to copy message to kernel mem\n"); - return STATUS_NO_MEMORY; - } - KernelModeMsg->lParam = (LPARAM) KernelMem; - - /* Copy data if required */ - if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) - { - Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); - ExFreePoolWithTag(KernelMem, TAG_MSG); - return Status; - } - } - else - { - /* Make sure we don't pass any secrets to usermode */ - RtlZeroMemory(KernelMem, Size); - } - } - else - { - KernelModeMsg->lParam = 0; - } - - return STATUS_SUCCESS; -} - -static NTSTATUS FASTCALL -CopyMsgToUserMem(MSG *UserModeMsg, MSG *KernelModeMsg) -{ - NTSTATUS Status; - PMSGMEMORY MsgMemoryEntry; - UINT Size; - - /* See if this message type is present in the table */ - MsgMemoryEntry = FindMsgMemory(UserModeMsg->message); - if (NULL == MsgMemoryEntry) - { - /* Not present, no copying needed */ - return STATUS_SUCCESS; - } - - /* Determine required size */ - Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); - - if (0 != Size) - { - /* Copy data if required */ - if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_WRITE)) - { - Status = MmCopyToCaller((PVOID) UserModeMsg->lParam, (PVOID) KernelModeMsg->lParam, Size); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to copy message from kernel: invalid usermode buffer\n"); - ExFreePool((PVOID) KernelModeMsg->lParam); - return Status; - } - } - - ExFreePool((PVOID) KernelModeMsg->lParam); - } - - return STATUS_SUCCESS; -} - static BOOL FASTCALL co_IntWaitMessage( PWND Window, UINT MsgFilterMin, @@ -775,9 +771,9 @@ /* Nothing found. Wait for new messages. */ Status = co_MsqWaitForNewMessages( ThreadQueue, - Window, - MsgFilterMin, - MsgFilterMax); + Window, + MsgFilterMin, + MsgFilterMax); } while ( (STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || STATUS_TIMEOUT == Status ); @@ -834,6 +830,7 @@ } pti = PsGetCurrentThreadWin32Thread(); + pti->pClientInfo->cSpins++; // Bump up the spin count. do { @@ -848,8 +845,11 @@ /* GetMessage or PostMessage must never get messages that contain pointers */ ASSERT(FindMsgMemory(pMsg->message) == NULL); - pti->timeLast = pMsg->time; - pti->ptLast = pMsg->pt; + if (pMsg->message != WM_PAINT && pMsg->message != WM_QUIT) + { + pti->timeLast = pMsg->time; + pti->ptLast = pMsg->pt; + } // The WH_GETMESSAGE hook enables an application to monitor messages about to // be returned by the GetMessage or PeekMessage function. @@ -984,7 +984,7 @@ KernelModeMsg.wParam, KernelModeMsg.lParam); - if(MsgMemoryEntry) + if (MsgMemoryEntry && KernelModeMsg.lParam) ExFreePool((PVOID) KernelModeMsg.lParam); return TRUE; @@ -1019,7 +1019,7 @@ { UserPostMessage(List[i], Msg, wParam, lParam); } - ExFreePool(List); + ExFreePoolWithTag(List,TAG_WINLIST);//ExFreePool(List); } } else Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Dec 17 01:09:42 2010 @@ -1624,7 +1624,7 @@ pti = PsGetCurrentThreadWin32Thread(); Message = pti->pusmCurrent; - if(!Message) return FALSE; + if (!Message) return FALSE; if (Message->QS_Flags & QS_SMRESULT) return FALSE;

14 years, 4 months

[greatlrd] 50046: [dxg.sys] add stub not with right protoype

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Dec 16 22:13:35 2010 New Revision: 50046 URL: http://svn.reactos.org/svn/reactos?rev=50046&view=rev Log: [dxg.sys] add stub not with right protoype Modified: branches/reactx/reactos/drivers/directx/dxg/stub.c Modified: branches/reactx/reactos/drivers/directx/dxg/stub.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/stub.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/stub.c [iso-8859-1] Thu Dec 16 22:13:35 2010 @@ -12,3 +12,628 @@ #include <dxg_int.h> #include "dxg_driver.h" +#define stub DPRINT1("UNIMPLEMENT"); / + return DDERR_UNSUPPORTED; + + +NTSTATUS +NTAPI +DxD3dContextCreate(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + stub; +} + +NTSTATUS +NTAPI +DxD3dContextDestroy(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxD3dContextDestroyAll(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxD3dValidateTextureStageState(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxD3dDrawPrimitives2(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDriverState(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdAddAttachedSurface(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdAlphaBlt(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdAttachSurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdBeginMoCompFrame)(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdBlt(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCanCreateSurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCanCreateD3DBuffer)( +{ + stub; +} + +NTSTATUS +NTAPI +DxDdColorControl(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateDirectDrawObject(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateSurface(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7, DWORD x8) +{ + /* NOTE : DxDdCreateD3DBuffer and DxDdCreateSurface are same */ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateMoComp(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateSurfaceObject(DWORD x1, DWORD x2, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDeleteDirectDrawObject(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDeleteSurfaceObject(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDestroyMoComp)(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDestroySurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDestroyD3DBuffer(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdEndMoCompFrame(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdFlip(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdFlipToGDISurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetAvailDriverMemory(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetBltStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDC(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDriverInfo(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDxHandle(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetFlipStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetInternalMoCompInfo(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetMoCompBuffInfo(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetMoCompGuids(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetMoCompFormats(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetScanLine(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdLock(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdLockD3D(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdQueryDirectDrawObject(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7, DWORD x8, DWORD x9 , DWORD x10 , DWORD x11) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdQueryMoCompStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdReenableDirectDrawObject(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdReleaseDC(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdRenderMoComp(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdResetVisrgn(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetColorKey(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetExclusiveMode(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetGammaRamp(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCreateSurfaceEx(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetOverlayPosition(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdUnattachSurface(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdUnlock(DWORD x1, DWORD x2) +{ + /* NOTE : DxDdUnlockD3D and DxDdUnlock are same */ + stub; +} + +NTSTATUS +NTAPI +DxDdUpdateOverlay(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdWaitForVerticalBlank(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpCanCreateVideoPort(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpColorControl(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpCreateVideoPort(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpDestroyVideoPort(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpFlipVideoPort(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortBandwidth(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortField(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortFlipStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortInputFormats(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortLine(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortOutputFormats(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoPortConnectInfo(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpGetVideoSignalStatus(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpUpdateVideoPort(DWORD x1, DWORD x2, DWORD x3, DWORD x4) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpWaitForVideoPortSync(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpAcquireNotification(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDvpReleaseNotification(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdHeapVidMemAllocAligned(DWORD x1, DWORD x2, DWORD x3, DWORD x4, DWORD x5) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdHeapVidMemFree(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDisableDirectDraw(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSuspendDirectDraw(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdResumeDirectDraw(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdDynamicModeChange(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdCloseProcess(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetDirectDrawBound(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdEnableDirectDrawRedirection(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdAllocPrivateUserMem(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdFreePrivateUserMem(DWORD x1, DWORD x2) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdSetAccelLevel(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdGetSurfaceLock(DWORD x1) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdEnumLockedSurfaceRect(DWORD x1, DWORD x2, DWORD x3) +{ + stub; +} + +NTSTATUS +NTAPI +DxDdEnableDirectDraw(PVOID pDev, BOOLEAN Enable) +{ + + /* NOTE not finsh yet + PGD_DXENGGETHDEVDATA pfDxEngGetHdevData; + PEDD_DIRECTDRAW_GLOBAL pEDDgpl; + + pfDxEngGetHdevData = (PGD_DXENGGETHDEVDATA)gpEngFuncs[DXENG_INDEX_DxEngGetHdevData].pfn; + + if ( pfDxEngGetHdevData(pDev, DxEGShDevData_display) ) + { + pEDDgpl = (PEDD_DIRECTDRAW_GLOBAL) pfDxEngGetHdevData(pDev,DxEGShDevData_eddg); + pEDDgpl->hDev = (HDEV) pDev; + pEDDgpl->dhpdev = (PVOID) pfDxEngGetHdevData(pDev, DxEGShDevData_dhpdev); + } + + return 1; + */ + stub; +} + +

14 years, 4 months

[gadamopoulos] 50045: remove some more unnecessary debug output

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Dec 16 21:42:28 2010 New Revision: 50045 URL: http://svn.reactos.org/svn/reactos?rev=50045&view=rev Log: remove some more unnecessary debug output Modified: trunk/reactos/base/services/svchost/svchost.c trunk/reactos/dll/win32/user32/windows/cursoricon.c trunk/reactos/subsystems/win32/win32k/eng/device.c trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -104,7 +104,7 @@ HeapFree(GetProcessHeap(), 0, Buffer); /* Load the service dll */ - DPRINT1("Trying to load dll\n"); + DPRINT("Trying to load dll\n"); hServiceDll = LoadLibrary(DllPath); if (NULL == hServiceDll) @@ -226,7 +226,7 @@ NrOfServices = LoadServiceCategory(argv[2]); - DPRINT1("NrOfServices: %lu\n", NrOfServices); + DPRINT("NrOfServices: %lu\n", NrOfServices); if (0 == NrOfServices) return 0; @@ -240,7 +240,7 @@ /* Fill the service table */ for (i = 0; i < NrOfServices; ++i) { - DPRINT1("Loading service: %s\n", Service->Name); + DPRINT("Loading service: %s\n", Service->Name); ServiceTable[i].lpServiceName = Service->Name; ServiceTable[i].lpServiceProc = Service->ServiceMainFunc; Service = Service->Next; Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -1005,7 +1005,7 @@ && (iDesiredCX > 0 || iDesiredCY > 0)) || nFlags & LR_MONOCHROME) { - FIXME("Copying from resource isn't implemented yet\n"); + TRACE("Copying from resource isn't implemented yet\n"); hNew = CopyIcon(hIcon); #if 0 Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -124,7 +124,7 @@ * This is a REG_MULTI_SZ string */ for (; *pwsz; pwsz += wcslen(pwsz) + 1) { - DPRINT1("trying driver: %ls\n", pwsz); + DPRINT("trying driver: %ls\n", pwsz); /* Try to load the display driver */ pldev = EngLoadImageEx(pwsz, LDEV_DEVICE_DISPLAY); if (!pldev) @@ -197,7 +197,7 @@ { pGraphicsDevice->iDefaultMode = i; pGraphicsDevice->iCurrentMode = i; - DPRINT1("Found default entry: %ld '%ls'\n", i, pdm->dmDeviceName); + DPRINT("Found default entry: %ld '%ls'\n", i, pdm->dmDeviceName); } /* Initialize the entry */ @@ -221,7 +221,7 @@ /* Unlock loader */ EngReleaseSemaphore(ghsemGraphicsDeviceList); - DPRINT1("Prepared %ld modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); + DPRINT("Prepared %ld modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); return pGraphicsDevice; } Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -117,7 +117,7 @@ { PFN_DrvEnablePDEV pfnEnablePDEV; - DPRINT1("PDEVOBJ_bEnablePDEV()\n"); + DPRINT("PDEVOBJ_bEnablePDEV()\n"); /* Get the DrvEnablePDEV function */ pfnEnablePDEV = ppdev->pldev->pfn.EnablePDEV; @@ -146,7 +146,7 @@ GDIOBJ_SetOwnership(ppdev->devinfo.hpalDefault, NULL); ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); - DPRINT1("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev); + DPRINT("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev); return TRUE; } @@ -266,7 +266,7 @@ { /* ... use the device's default one */ pdm = pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; - DPRINT1("Using iDefaultMode = %ld\n", pGraphicsDevice->iDefaultMode); + DPRINT("Using iDefaultMode = %ld\n", pGraphicsDevice->iDefaultMode); } /* Try to get a diplay driver */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -572,7 +572,7 @@ QueryTable, NULL, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("RtlQueryRegistryValues failed for PaintDesktopVersion (%x)\n", + DPRINT("RtlQueryRegistryValues failed for PaintDesktopVersion (%x)\n", Status); g_PaintDesktopVersion = FALSE; return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -551,7 +551,7 @@ ULONG cbSize, cbExtra; DEVMODEW dmReg, *pdm; - DPRINT1("Enter NtUserEnumDisplaySettings(%ls, %ld)\n", + DPRINT("Enter NtUserEnumDisplaySettings(%ls, %ld)\n", pustrDevice ? pustrDevice->Buffer : 0, iModeNum); if (pustrDevice) Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Thu Dec 16 21:42:28 2010 @@ -41,7 +41,7 @@ /* attach monitor */ IntAttachMonitor(gppdevPrimary, 0); - DPRINT1("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n", + DPRINT("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n", pPrimarySurface, pPrimarySurface->pSurface); /* Create surface */

14 years, 4 months

[greatlrd] 50044: update the dxg header that are share betwin win32k and dxg

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Dec 16 21:06:33 2010 New Revision: 50044 URL: http://svn.reactos.org/svn/reactos?rev=50044&view=rev Log: update the dxg header that are share betwin win32k and dxg Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h [iso-8859-1] Thu Dec 16 21:06:33 2010 @@ -47,7 +47,6 @@ #define DXG_INDEX_DxDdGetMoCompGuids 0x24 #define DXG_INDEX_DxDdGetMoCompFormats 0x25 #define DXG_INDEX_DxDdGetScanLine 0x26 -/* DXG_INDEX_DxDdLock and DXG_INDEX_DxDdLockD3D are same */ #define DXG_INDEX_DxDdLock 0x27 #define DXG_INDEX_DxDdLockD3D 0x28 #define DXG_INDEX_DxDdQueryDirectDrawObject 0x29 @@ -115,6 +114,8 @@ #define DXG_INDEX_DxDdSetAccelLevel 0x58 #define DXG_INDEX_DxDdGetSurfaceLock 0x59 #define DXG_INDEX_DxDdEnumLockedSurfaceRect 0x5A +#define DXG_INDEX_DxDdIoctl 0x5B +#define DXG_INDEX_DxDdSwitchToGDI 0x5C /***********************************************************************************/

14 years, 4 months

[gadamopoulos] 50043: [win32k] -Remove an unneeded debug message

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Dec 16 20:41:25 2010 New Revision: 50043 URL: http://svn.reactos.org/svn/reactos?rev=50043&view=rev Log: [win32k] -Remove an unneeded debug message Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Dec 16 20:41:25 2010 @@ -909,8 +909,6 @@ PTHREADINFO pThread; LARGE_INTEGER LargeTickCount; NTSTATUS Status; - - DPRINT1("UserPostThreadMessage wParam 0x%x lParam 0x%x\n", wParam,lParam); if (FindMsgMemory(Msg) != 0) {

14 years, 4 months

[gadamopoulos] 50042: [user32_winetest] -revert the previous commit

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Dec 16 19:11:13 2010 New Revision: 50042 URL: http://svn.reactos.org/svn/reactos?rev=50042&view=rev Log: [user32_winetest] -revert the previous commit Modified: trunk/rostests/winetests/user32/menu.c Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Thu Dec 16 19:11:13 2010 @@ -3067,9 +3067,6 @@ ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); } ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); - - skip("skipping TrackPopupMenu, that hangs on reactos\n"); -#if 0 /* menu owner is child window */ g_hwndtosend = hwndchild; ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); @@ -3082,7 +3079,6 @@ g_hwndtosend = hwnd; ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle); -#endif /* cleanup */ DestroyMenu( menu); DestroyWindow( hwndchild);

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs