Ros-diffs April 2006

ros-diffs@reactos.org

14 participants
324 discussions

[greatlrd] 21546: more redesign of ddraw. move hal and hel detection of cancreatesurface and createsurface HEL and HAL and use HAL if it found, if HAL not found use HEL
by greatlrd＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: greatlrd Date: Tue Apr 11 11:43:29 2006 New Revision: 21546 URL: http://svn.reactos.ru/svn/reactos?rev=21546&view=rev Log: more redesign of ddraw. move hal and hel detection of cancreatesurface and createsurface HEL and HAL and use HAL if it found, if HAL not found use HEL Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Apr 11 11:43:29 2006 @@ -102,7 +102,31 @@ Hal_DirectDraw_Initialize (iface); Hel_DirectDraw_Initialize (iface); - + This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + } + else + { + This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; + } + + This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + { + This->mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + } + else + { + This->mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; + } + + This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; + This->mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + return DD_OK; } @@ -348,48 +372,24 @@ //IDirectDrawImpl* This = (IDirectDrawImpl*)iface; //IDirectDrawSurfaceImpl* That = ppSurf; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) - { - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - } - else - { - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; - } - - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) - { - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - } - else - { - mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; - } - - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; - - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + This->mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + + if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; } - if (mDdCanCreateSurface.ddRVal != DD_OK) + if (This->mDdCanCreateSurface.ddRVal != DD_OK) { return DDERR_NOTINITIALIZED; } @@ -420,19 +420,19 @@ - mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; - mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; - mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; + This->mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; + This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + if (This->mDdCreateSurface.CreateSurface(&This->mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; } - if (mDdCreateSurface.ddRVal != DD_OK) + if (This->mDdCreateSurface.ddRVal != DD_OK) { - return mDdCreateSurface.ddRVal; + return This->mDdCreateSurface.ddRVal; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Tue Apr 11 11:43:29 2006 @@ -77,6 +77,10 @@ /* internal counter */ ULONG ref; + + /* Callbacks info */ + DDHAL_CREATESURFACEDATA mDdCreateSurface; + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; } IDirectDrawImpl;

1 0

[greatlrd] 21545: Start redesgin ddraw. so we can resue code betwin HEL and HAL interface. Todo so we create HEL Callbacks in HEL Callbacks shall the software version of the api be implement.
by greatlrd＠svn.reactos.org 11 Apr '06

11 Apr '06

Author: greatlrd Date: Tue Apr 11 10:24:29 2006 New Revision: 21545 URL: http://svn.reactos.ru/svn/reactos?rev=21545&view=rev Log: Start redesgin ddraw. so we can resue code betwin HEL and HAL interface. Todo so we create HEL Callbacks in HEL Callbacks shall the software version of the api be implement. Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Tue Apr 11 10:24:29 2006 @@ -11,282 +11,7 @@ #include "rosdraw.h" -HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter) -{ - // UINT i; - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - IDirectDrawSurfaceImpl* That = ppSurf; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - - - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) - { - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - } - else - { - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; - } - - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - - if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - - memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; - - if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - memset(&That->Surf->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - That->Surf->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - That->Surf->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - That->Surf->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - That->Surf->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - That->Surf->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - That->Surf->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; - - memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Surf->mPrimaryLocal.lpGbl = &That->Surf->mPrimaryGlobal; - That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; - That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); - - /* - FIXME Check the flags if we shall create a primaresurface for overlay or something else - Examine windows which flags are being set for we assume this is right unsue I think - */ - //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; - That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; - - - - mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; - mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; - mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; - - - if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - - /* FIXME fill in this if they are avali - DDSD_BACKBUFFERCOUNT - DDSD_CKDESTBLT - DDSD_CKDESTOVERLAY - DDSD_CKSRCBLT - DDSD_CKSRCOVERLAY - DDSD_LINEARSIZE - DDSD_LPSURFACE - DDSD_MIPMAPCOUNT - DDSD_ZBUFFERBITDEPTH - */ - - That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; - RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); - RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); - - //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); - //RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); - - if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; - That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; - } - - if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; - That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; - } - - if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; - That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; - } - - if ( This->mDDrawGlobal.dwMonitorFrequency != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; - That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - } - - if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; - That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; - } - - return DD_OK; - - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) - { - // DX_STUB_str( "Can not create overlay surface"); - // memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); - // memcpy(&That->Surf->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); - // That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - //That->Surf->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - - //That->Surf->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - //That->Surf->mddsdOverlay.dwWidth = 100; //pels; - //That->Surf->mddsdOverlay.dwHeight = 100; // lines; - //That->Surf->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - //That->Surf->mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - //That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; - //That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; - - //mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - //mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - //mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - //mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay; // pDDSD; - - - //if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - //{ - // return DDERR_NOTINITIALIZED; - //} - - //if (mDdCanCreateSurface.ddRVal != DD_OK) - //{ - // return DDERR_NOTINITIALIZED; - //} - - //memset(&That->Surf->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - //That->Surf->mOverlayGlobal.dwGlobalFlags = 0; - //That->Surf->mOverlayGlobal.lpDD = &This->mDDrawGlobal; - //That->Surf->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; - //That->Surf->mOverlayGlobal.wWidth = (WORD)That->Surf->mddsdOverlay.dwWidth; - //That->Surf->mOverlayGlobal.wHeight = (WORD)That->Surf->mddsdOverlay.dwHeight; - //That->Surf->mOverlayGlobal.lPitch = -1; - //That->Surf->mOverlayGlobal.ddpfSurface = That->Surf->mddsdOverlay.ddpfPixelFormat; - - //// setup front- and backbuffer surfaces - //UINT cSurfaces = That->Surf->mddsdOverlay.dwBackBufferCount + 1; - //for (i = 0; i < cSurfaces; i++) - //{ - // memset(&That->Surf->mOverlayMore[i], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - // That->Surf->mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - // memset(&That->Surf->mOverlayLocal[i], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - // That->Surf->mOverlayLocal[i].lpGbl = &That->Surf->mOverlayGlobal; - // That->Surf->mOverlayLocal[i].lpSurfMore = &That->Surf->mOverlayMore[i]; - // That->Surf->mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); - // That->Surf->mOverlayLocal[i].dwFlags = (i == 0) ? - // (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): - // (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); - - // That->Surf->mOverlayLocal[i].dwFlags |= DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| DDRAWISURF_HASPIXELFORMAT| DDRAWISURF_HASOVERLAYDATA; - - // That->Surf->mOverlayLocal[i].ddsCaps.dwCaps = That->Surf->mddsdOverlay.ddsCaps.dwCaps; - // That->Surf->mpOverlayLocals[i] = &That->Surf->mOverlayLocal[i]; - //} - - //for (i = 0; i < cSurfaces; i++) - //{ - // UINT j = (i + 1) % cSurfaces; - // if (!DdAttachSurface(That->Surf->mpOverlayLocals[i], That->Surf->mpOverlayLocals[j])) - // { - // // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); - // return DD_FALSE; - // } - //} - - //mDdCreateSurface.lpDD = &This->mDDrawGlobal; - //mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - //mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay;//pDDSD; - //mDdCreateSurface.lplpSList = That->Surf->mpOverlayLocals; //cSurfaces; - //mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - //if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - //{ - // return DDERR_NOTINITIALIZED; - //} - - //if (mDdCreateSurface.ddRVal != DD_OK) - //{ - // return mDdCreateSurface.ddRVal; - //} - - //DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - //mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; - //mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; - //mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; - //mDdUpdateOverlay.lpDDSrcSurface = That->Surf->mpOverlayLocals[0];//pDDSurface; - //mDdUpdateOverlay.dwFlags = DDOVER_SHOW; - - //mDdUpdateOverlay.rDest.top = 0; - //mDdUpdateOverlay.rDest.left = 0; - //mDdUpdateOverlay.rDest.right = 50; - //mDdUpdateOverlay.rDest.bottom = 50; - - //mDdUpdateOverlay.rSrc.top = 0; - //mDdUpdateOverlay.rSrc.left = 0; - //mDdUpdateOverlay.rSrc.right = 50; - //mDdUpdateOverlay.rSrc.bottom = 50; - - //if (mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) - //{ - // return DDERR_NOTINITIALIZED; - //} - - //if (mDdUpdateOverlay.ddRVal != DD_OK) - //{ - // return mDdUpdateOverlay.ddRVal; - //} - - return DD_OK; - return DDERR_INVALIDSURFACETYPE; - - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) - { - DX_STUB_str( "Can not create backbuffer surface"); - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - DX_STUB_str( "Can not create texture surface"); - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - { - DX_STUB_str( "Can not create zbuffer surface"); - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) - { - DX_STUB_str( "Can not create offscreenplain surface"); - } - - return DDERR_INVALIDSURFACETYPE; -} HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Apr 11 10:24:29 2006 @@ -298,7 +298,6 @@ { DX_WINDBG_trace(); - HRESULT ret; DxSurf *surf; if (pUnkOuter!=NULL) @@ -328,8 +327,7 @@ return E_OUTOFMEMORY; } - - + That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; *ppSurf = (LPDIRECTDRAWSURFACE7)That; @@ -346,20 +344,290 @@ That->Surf = surf; - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) - { - ret = Hal_DirectDraw_CreateSurface (iface, pDDSD, That, pUnkOuter); - } - else - { - ret = Hel_DirectDraw_CreateSurface (iface, pDDSD, ppSurf, pUnkOuter); - } - - //This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)&This->mPrimaryLocal; - - // the real surface object creation + // UINT i; + //IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + //IDirectDrawSurfaceImpl* That = ppSurf; + + DDHAL_CREATESURFACEDATA mDdCreateSurface; + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + + mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + } + else + { + mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; + } + + mDdCreateSurface.lpDD = &This->mDDrawGlobal; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + { + mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + } + else + { + mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; + } + + mDdCreateSurface.lpDD = &This->mDDrawGlobal; + mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + + memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + return DDERR_NOTINITIALIZED; + } + + memset(&That->Surf->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + That->Surf->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + That->Surf->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + That->Surf->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + That->Surf->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + That->Surf->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + That->Surf->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; + + memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Surf->mPrimaryLocal.lpGbl = &That->Surf->mPrimaryGlobal; + That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; + That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + + /* + FIXME Check the flags if we shall create a primaresurface for overlay or something else + Examine windows which flags are being set for we assume this is right unsue I think + */ + //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; + That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; + + + + mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; + mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; + + + if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } + + + /* FIXME fill in this if they are avali + DDSD_BACKBUFFERCOUNT + DDSD_CKDESTBLT + DDSD_CKDESTOVERLAY + DDSD_CKSRCBLT + DDSD_CKSRCOVERLAY + DDSD_LINEARSIZE + DDSD_LPSURFACE + DDSD_MIPMAPCOUNT + DDSD_ZBUFFERBITDEPTH + */ + + That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; + RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + + //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); + //RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); + + if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; + That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; + } + + if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; + That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; + } + + if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; + That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; + } + + if ( This->mDDrawGlobal.dwMonitorFrequency != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; + That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + } + + if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) + { + That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; + That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + } + + return DD_OK; + + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) + { + // DX_STUB_str( "Can not create overlay surface"); + // memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); + // memcpy(&That->Surf->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); + // That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); + //That->Surf->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; + + //That->Surf->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + + //That->Surf->mddsdOverlay.dwWidth = 100; //pels; + //That->Surf->mddsdOverlay.dwHeight = 100; // lines; + //That->Surf->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; + + //That->Surf->mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + //That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; + //That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; + + //mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + //mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + //mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; + //mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay; // pDDSD; - return DD_OK; + + //if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdCanCreateSurface.ddRVal != DD_OK) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //memset(&That->Surf->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + //That->Surf->mOverlayGlobal.dwGlobalFlags = 0; + //That->Surf->mOverlayGlobal.lpDD = &This->mDDrawGlobal; + //That->Surf->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; + //That->Surf->mOverlayGlobal.wWidth = (WORD)That->Surf->mddsdOverlay.dwWidth; + //That->Surf->mOverlayGlobal.wHeight = (WORD)That->Surf->mddsdOverlay.dwHeight; + //That->Surf->mOverlayGlobal.lPitch = -1; + //That->Surf->mOverlayGlobal.ddpfSurface = That->Surf->mddsdOverlay.ddpfPixelFormat; + + //// setup front- and backbuffer surfaces + //UINT cSurfaces = That->Surf->mddsdOverlay.dwBackBufferCount + 1; + //for (i = 0; i < cSurfaces; i++) + //{ + // memset(&That->Surf->mOverlayMore[i], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + // That->Surf->mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + // memset(&That->Surf->mOverlayLocal[i], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + // That->Surf->mOverlayLocal[i].lpGbl = &That->Surf->mOverlayGlobal; + // That->Surf->mOverlayLocal[i].lpSurfMore = &That->Surf->mOverlayMore[i]; + // That->Surf->mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); + // That->Surf->mOverlayLocal[i].dwFlags = (i == 0) ? + // (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): + // (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); + + // That->Surf->mOverlayLocal[i].dwFlags |= DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| DDRAWISURF_HASPIXELFORMAT| DDRAWISURF_HASOVERLAYDATA; + + // That->Surf->mOverlayLocal[i].ddsCaps.dwCaps = That->Surf->mddsdOverlay.ddsCaps.dwCaps; + // That->Surf->mpOverlayLocals[i] = &That->Surf->mOverlayLocal[i]; + //} + + //for (i = 0; i < cSurfaces; i++) + //{ + // UINT j = (i + 1) % cSurfaces; + // if (!DdAttachSurface(That->Surf->mpOverlayLocals[i], That->Surf->mpOverlayLocals[j])) + // { + // // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); + // return DD_FALSE; + // } + //} + + //mDdCreateSurface.lpDD = &This->mDDrawGlobal; + //mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + //mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay;//pDDSD; + //mDdCreateSurface.lplpSList = That->Surf->mpOverlayLocals; //cSurfaces; + //mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; + + //if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdCreateSurface.ddRVal != DD_OK) + //{ + // return mDdCreateSurface.ddRVal; + //} + + //DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; + //mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; + //mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; + //mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; + //mDdUpdateOverlay.lpDDSrcSurface = That->Surf->mpOverlayLocals[0];//pDDSurface; + //mDdUpdateOverlay.dwFlags = DDOVER_SHOW; + + //mDdUpdateOverlay.rDest.top = 0; + //mDdUpdateOverlay.rDest.left = 0; + //mDdUpdateOverlay.rDest.right = 50; + //mDdUpdateOverlay.rDest.bottom = 50; + + //mDdUpdateOverlay.rSrc.top = 0; + //mDdUpdateOverlay.rSrc.left = 0; + //mDdUpdateOverlay.rSrc.right = 50; + //mDdUpdateOverlay.rSrc.bottom = 50; + + //if (mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdUpdateOverlay.ddRVal != DD_OK) + //{ + // return mDdUpdateOverlay.ddRVal; + //} + + return DD_OK; + return DDERR_INVALIDSURFACETYPE; + + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) + { + DX_STUB_str( "Can not create backbuffer surface"); + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + { + DX_STUB_str( "Can not create texture surface"); + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + DX_STUB_str( "Can not create zbuffer surface"); + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) + { + DX_STUB_str( "Can not create offscreenplain surface"); + } + + return DDERR_INVALIDSURFACETYPE; + } HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, DWORD dwFlags, Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Tue Apr 11 10:24:29 2006 @@ -173,7 +173,6 @@ HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter); HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); HRESULT Hal_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags); HRESULT Hal_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey); @@ -190,7 +189,6 @@ HRESULT Hel_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DWORD , DWORD ); HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hel_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); HRESULT Hel_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey); HRESULT Hel_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); @@ -200,6 +198,7 @@ /* HEL CALLBACK */ DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA pccsd); +DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface); /* Setting for HEL should be move to ros special reg key ? */ Modified: trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Tue Apr 11 10:24:29 2006 @@ -18,10 +18,11 @@ This->HELMemoryAvilable = HEL_GRAPHIC_MEMORY_MAX; - This->mCallbacks.HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE; This->mCallbacks.HELDD.CanCreateSurface = HelDdCanCreateSurface; + This->mCallbacks.HELDD.dwFlags = DDHAL_CB32_CREATESURFACE; + This->mCallbacks.HELDD.CreateSurface = HelDdCreateSurface; return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c Tue Apr 11 10:24:29 2006 @@ -138,3 +138,8 @@ pccsd->ddRVal = DD_OK; return DDHAL_DRIVER_HANDLED; } + +DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface) +{ + DX_STUB; +} Modified: trunk/reactos/dll/directx/ddraw/soft/surface_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Tue Apr 11 10:24:29 2006 @@ -11,10 +11,7 @@ #include "rosdraw.h" -HRESULT Hel_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) -{ - DX_STUB; -} + HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx)

1 0

[greatlrd] 21544: see fireball last commit msg about this file, patch from w3seek : Use RtlComputeCrc32 instead of yet another inline implementation for calculating a CRC32 checksum. The attached patch fixes this. bug : 1342
by greatlrd＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: greatlrd Date: Mon Apr 10 23:57:47 2006 New Revision: 21544 URL: http://svn.reactos.ru/svn/reactos?rev=21544&view=rev Log: see fireball last commit msg about this file, patch from w3seek : Use RtlComputeCrc32 instead of yet another inline implementation for calculating a CRC32 checksum. The attached patch fixes this. bug : 1342 Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Apr 10 23:57:47 2006 @@ -273,6 +273,14 @@ RtlCaptureContext(OUT PCONTEXT ContextRecord); NTSYSAPI +ULONG +NTAPI +RtlComputeCrc32( + IN ULONG Initial, + IN PUCHAR Data, + IN ULONG Length); + +NTSYSAPI PVOID NTAPI RtlEncodePointer(IN PVOID Pointer); Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c Mon Apr 10 23:57:47 2006 @@ -24,78 +24,6 @@ PDRIVER_OBJECT IopRootDriverObject; PIO_BUS_TYPE_GUID_LIST IopBusTypeGuidList = NULL; - -// Static CRC table -ULONG crc32Table[256] = -{ - 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, - 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, - 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, - 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, - 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, - 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, - 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, - 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, - 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, - 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, - 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, - 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, - 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, - 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, - 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, - 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, - - 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, - 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, - 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, - 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, - 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, - 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, - 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, - 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, - 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, - 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, - 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, - 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, - 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, - 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, - 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, - 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, - - 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, - 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, - 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, - 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, - 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, - 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, - 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, - 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, - 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, - 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, - 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, - 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, - 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, - 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, - 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, - 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, - - 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, - 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, - 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, - 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, - 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, - 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, - 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, - 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, - 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, - 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, - 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, - 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, - 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, - 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, - 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, - 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D, -}; static NTSTATUS INIT_FUNCTION IopSetRootDeviceInstanceData(PDEVICE_NODE DeviceNode); @@ -1390,9 +1318,7 @@ UNICODE_STRING ValueName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hKey = INVALID_HANDLE_VALUE; - PBYTE currentByte; - ULONG crc32 = 0; - ULONG i; + ULONG crc32; NTSTATUS Status; /* HACK: As long as some devices have a NULL device @@ -1446,10 +1372,10 @@ } /* 2. Create the ParentIdPrefix value */ - currentByte = (PBYTE)DeviceNode->Parent->InstancePath.Buffer; - for (i = 0; i < DeviceNode->Parent->InstancePath.Length; i++, currentByte++) - crc32 = (crc32 >> 8) ^ crc32Table[*currentByte ^ (crc32 & 0xff)]; - crc32 = ~crc32; + crc32 = RtlComputeCrc32(0, + (PUCHAR)DeviceNode->Parent->InstancePath.Buffer, + DeviceNode->Parent->InstancePath.Length); + swprintf((PWSTR)ParentIdPrefixInformation->Data, L"%lx&%lx", DeviceNode->Parent->Level, crc32); RtlInitUnicodeString(&KeyValue, (PWSTR)ParentIdPrefixInformation->Data);

1 0

[greatlrd] 21543: Bug 1376, patch from SuperTrax at gmx dot de if a Window was showed normaly, GetWindowPlacement never returned a showCmd.
by greatlrd＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: greatlrd Date: Mon Apr 10 23:21:22 2006 New Revision: 21543 URL: http://svn.reactos.ru/svn/reactos?rev=21543&view=rev Log: Bug 1376, patch from SuperTrax at gmx dot de if a Window was showed normaly, GetWindowPlacement never returned a showCmd. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Mon Apr 10 23:21:22 2006 @@ -3676,7 +3676,7 @@ { Safepl.showCmd = SW_MINIMIZE; } - else if (0 != (Window->Style & WS_MINIMIZE)) + else if (0 != (Window->Style & WS_VISIBLE)) { Safepl.showCmd = SW_SHOWNORMAL; }

1 0

[tretiakov] 21542: Make windows button open start menu. Fixes buf 1356. Patch by SuperTrax@gmx.de
by tretiakov＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: tretiakov Date: Mon Apr 10 21:58:47 2006 New Revision: 21542 URL: http://svn.reactos.ru/svn/reactos?rev=21542&view=rev Log: Make windows button open start menu. Fixes buf 1356. Patch by SuperTrax(a)gmx.de Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.h Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/taskbar… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp Mon Apr 10 21:58:47 2006 @@ -102,6 +102,10 @@ // create "Start" button HWND hwndStart = Button(_hwnd, start_str, 1, 1, start_btn_width, REBARBAND_HEIGHT, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW); new StartButton(hwndStart); + + /* Save the handle to the window, needed for push-state handling */ + _hwndStartButton = hwndStart; + // disable double clicks SetClassLong(hwndStart, GCL_STYLE, GetClassLong(hwndStart, GCL_STYLE) & ~CS_DBLCLKS); @@ -451,7 +455,16 @@ void DesktopBar::ShowStartMenu() { if (_startMenuRoot) - _startMenuRoot->TrackStartmenu(); + { + // set the Button, if not set + if (!Button_GetState(_hwndStartButton)) + Button_SetState(_hwndStartButton, TRUE); + + _startMenuRoot->TrackStartmenu(); + + // StartMenu was closed, release button state + Button_SetState(_hwndStartButton, false); + } } Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/taskbar… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.h (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.h Mon Apr 10 21:58:47 2006 @@ -104,7 +104,9 @@ WindowHandle _hwndNotify; WindowHandle _hwndQuickLaunch; WindowHandle _hwndrebar; - + /* Needed to make the StartButton pushed, if it's called by windowskey: SC_TASKLIST command */ + WindowHandle _hwndStartButton; + struct StartMenuRoot* _startMenuRoot; #ifdef _ROS_

1 0

[greatlrd] 21541: RtlIntegerToUnicodeString incress the interal buffer size to 33bytes as wine does RtlInt64ToUnicodeString incress the interal buffer size to 65bytes as wine does This will take care of some intToChar Bugs I have been locking of it for sometimes now thanks to crashfourit network patch and we talk I did found it.
by greatlrd＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: greatlrd Date: Mon Apr 10 21:21:46 2006 New Revision: 21541 URL: http://svn.reactos.ru/svn/reactos?rev=21541&view=rev Log: RtlIntegerToUnicodeString incress the interal buffer size to 33bytes as wine does RtlInt64ToUnicodeString incress the interal buffer size to 65bytes as wine does This will take care of some intToChar Bugs I have been locking of it for sometimes now thanks to crashfourit network patch and we talk I did found it. Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=21541… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c (original) +++ trunk/reactos/lib/rtl/unicode.c Mon Apr 10 21:21:46 2006 @@ -625,7 +625,7 @@ IN OUT PUNICODE_STRING String) { ANSI_STRING AnsiString; - CHAR Buffer[16]; + CHAR Buffer[33]; NTSTATUS Status; Status = RtlIntegerToChar(Value, Base, sizeof(Buffer), Buffer); @@ -653,7 +653,7 @@ { LARGE_INTEGER LargeInt; ANSI_STRING AnsiString; - CHAR Buffer[32]; + CHAR Buffer[65]; NTSTATUS Status; LargeInt.QuadPart = Value;

1 0

[tretiakov] 21540: Add gradient tests. Patch by Timo Kreuzer <timo.kreuzer@web.de>
by tretiakov＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: tretiakov Date: Mon Apr 10 21:16:37 2006 New Revision: 21540 URL: http://svn.reactos.ru/svn/reactos?rev=21540&view=rev Log: Add gradient tests. Patch by Timo Kreuzer <timo.kreuzer(a)web.de> Added: trunk/reactos/base/applications/utils/rosperf/gradient.c Modified: trunk/reactos/base/applications/utils/rosperf/rosperf.h trunk/reactos/base/applications/utils/rosperf/rosperf.rbuild trunk/reactos/base/applications/utils/rosperf/testlist.c Added: trunk/reactos/base/applications/utils/rosperf/gradient.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/ros… ============================================================================== --- trunk/reactos/base/applications/utils/rosperf/gradient.c (added) +++ trunk/reactos/base/applications/utils/rosperf/gradient.c Mon Apr 10 21:16:37 2006 @@ -1,0 +1,154 @@ +/* + * ReactOS RosPerf - ReactOS GUI performance test program (gradient.c) + * + * Copyright 2006 Timo Kreuzer <timo.kreuzer(a)web.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <windows.h> +#include "rosperf.h" + +void +GradientProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + HDC Dc; + TRIVERTEX vert[6]; + static GRADIENT_TRIANGLE gcap[4]; + + Dc = PerfInfo->ForegroundDc; + vert[0].x = 0; + vert[0].y = 0; + vert[0].Red = 0xff00; + vert[0].Green = 0; + vert[0].Blue = 0; + vert[0].Alpha = 0; + vert[1].x = PerfInfo->WndWidth;; + vert[1].y = 0; + vert[1].Red = 0; + vert[1].Green = 0xff00; + vert[1].Blue = 0; + vert[1].Alpha = 0; + vert[2].x = PerfInfo->WndWidth; + vert[2].y = PerfInfo->WndHeight; + vert[2].Red = 0; + vert[2].Green = 0; + vert[2].Blue = 0xff00; + vert[2].Alpha = 0; + vert[3].x = 0; + vert[3].y = PerfInfo->WndHeight; + vert[3].Red = 0; + vert[3].Green = 0xff00; + vert[3].Blue = 0; + vert[3].Alpha = 0; + vert[4].Red = 0; + vert[4].Green = 0; + vert[4].Blue = 0; + vert[4].Alpha = 0; + vert[5].Red = 0; + vert[5].Green = 0; + vert[5].Blue = 0; + vert[5].Alpha = 0; + + for (Rep = 0; Rep < Reps; Rep++) + { + switch (2 * Rep / Reps) + { + case 0: + vert[4].x = PerfInfo->WndWidth * 2 * Rep / Reps; + vert[4].y = 0; + vert[5].x = PerfInfo->WndWidth - vert[4].x; + vert[5].y = PerfInfo->WndHeight; + gcap[0].Vertex1 = 5; gcap[0].Vertex2 = 0; gcap[0].Vertex3 = 4; + gcap[1].Vertex1 = 5; gcap[1].Vertex2 = 4; gcap[1].Vertex3 = 1; + gcap[2].Vertex1 = 5; gcap[2].Vertex2 = 1; gcap[2].Vertex3 = 2; + gcap[3].Vertex1 = 5; gcap[3].Vertex2 = 3; gcap[3].Vertex3 = 0; + break; + case 1: + vert[4].x = PerfInfo->WndWidth; + vert[4].y = PerfInfo->WndHeight * 2 * Rep / Reps - PerfInfo->WndHeight; + vert[5].x = 0; + vert[5].y = PerfInfo->WndHeight - vert[4].y; + gcap[0].Vertex1 = 5; gcap[0].Vertex2 = 1; gcap[0].Vertex3 = 4; + gcap[1].Vertex1 = 5; gcap[1].Vertex2 = 4; gcap[1].Vertex3 = 2; + gcap[2].Vertex1 = 5; gcap[2].Vertex2 = 2; gcap[2].Vertex3 = 3; + gcap[3].Vertex1 = 5; gcap[3].Vertex2 = 0; gcap[3].Vertex3 = 1; + break; + } + + GradientFill(Dc, vert, 6, &gcap, 4, GRADIENT_FILL_TRIANGLE); + } +} + +void +GradientHorizontalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + HDC Dc; + TRIVERTEX vert[2]; + static GRADIENT_RECT gcap = {0, 1}; + + Dc = PerfInfo->ForegroundDc; + for (Rep = 0; Rep < Reps; Rep++) + { + vert[0].x = 0; + vert[0].y = 0; + vert[0].Red = 0xff00; + vert[0].Green = 0xff00 - 0xff00 * Rep / Reps; + vert[0].Blue = 0xff00 * Rep / Reps; + vert[0].Alpha = 0; + + vert[1].x = PerfInfo->WndWidth; + vert[1].y = PerfInfo->WndHeight; + vert[1].Red = 0xff00 - 0xff00 * Rep / Reps; + vert[1].Green = 0xff00 * Rep / Reps; + vert[1].Blue = 0xff00; + vert[1].Alpha = 0; + + GradientFill(Dc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H); + } +} + +void +GradientVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + HDC Dc; + TRIVERTEX vert[2]; + static GRADIENT_RECT gcap = {0, 1}; + + Dc = PerfInfo->ForegroundDc; + for (Rep = 0; Rep < Reps; Rep++) + { + vert[0].x = 0; + vert[0].y = 0; + vert[0].Red = 0xff00 * Rep / Reps; + vert[0].Green = 0xff00 - 0xff00 * Rep / Reps; + vert[0].Blue = 0xff00; + vert[0].Alpha = 0; + + vert[1].x = PerfInfo->WndWidth; + vert[1].y = PerfInfo->WndHeight; + vert[1].Red = 0xff00 - 0xff00 * Rep / Reps; + vert[1].Green = 0xff00; + vert[1].Blue = 0xff00 * Rep / Reps; + vert[1].Alpha = 0; + + GradientFill(Dc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V); + } +} + +/* EOF */ Modified: trunk/reactos/base/applications/utils/rosperf/rosperf.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/ros… ============================================================================== --- trunk/reactos/base/applications/utils/rosperf/rosperf.h (original) +++ trunk/reactos/base/applications/utils/rosperf/rosperf.h Mon Apr 10 21:16:37 2006 @@ -65,6 +65,10 @@ void AlphaBlendCleanup(void *Context, PPERF_INFO PerfInfo); void AlphaBlendProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); +void GradientHorizontalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); +void GradientVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); +void GradientProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); + #endif /* ROSPERF_H_INCLUDED */ /* EOF */ Modified: trunk/reactos/base/applications/utils/rosperf/rosperf.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/ros… ============================================================================== --- trunk/reactos/base/applications/utils/rosperf/rosperf.rbuild (original) +++ trunk/reactos/base/applications/utils/rosperf/rosperf.rbuild Mon Apr 10 21:16:37 2006 @@ -2,7 +2,7 @@ <include base="rosperf">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> - <define name="WINVER">0x0500</define> + <define name="WINVER">0x0501</define> <library>version</library> <library>msimg32</library> <library>gdi32</library> @@ -15,5 +15,6 @@ <file>text.c</file> <file>alphablend.c</file> <file>testlist.c</file> + <file>gradient.c</file> <file>rosperf.rc</file> </module> Modified: trunk/reactos/base/applications/utils/rosperf/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/ros… ============================================================================== --- trunk/reactos/base/applications/utils/rosperf/testlist.c (original) +++ trunk/reactos/base/applications/utils/rosperf/testlist.c Mon Apr 10 21:16:37 2006 @@ -27,7 +27,10 @@ { L"vlines", L"Vertical Lines", NullInit, LinesVerticalProc, NullCleanup, NullCleanup }, { L"lines", L"Lines", NullInit, LinesProc, NullCleanup, NullCleanup }, { L"text", L"Text", NullInit, TextProc, NullCleanup, NullCleanup }, - { L"alpha", L"Alpha Blend", AlphaBlendInit, AlphaBlendProc, NullCleanup, AlphaBlendCleanup } + { L"alpha", L"Alpha Blend", AlphaBlendInit, AlphaBlendProc, NullCleanup, AlphaBlendCleanup }, + { L"hgradient", L"Horizontal Gradient", NullInit, GradientHorizontalProc, NullCleanup, NullCleanup }, + { L"vgradient", L"Vertical Gradient", NullInit, GradientVerticalProc, NullCleanup, NullCleanup }, + { L"gradient", L"Gradient", NullInit, GradientProc, NullCleanup, NullCleanup } };

1 0

[tretiakov] 21539: Build rosperf and ps
by tretiakov＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: tretiakov Date: Mon Apr 10 20:42:55 2006 New Revision: 21539 URL: http://svn.reactos.ru/svn/reactos?rev=21539&view=rev Log: Build rosperf and ps Added: trunk/reactos/base/applications/utils/utils.rbuild Removed: trunk/reactos/base/applications/utils/directory.rbuild Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/applicati… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Mon Apr 10 20:42:55 2006 @@ -61,4 +61,7 @@ <directory name="control"> <xi:include href="control/control.rbuild" /> </directory> +<directory name="utils"> + <xi:include href="utils/utils.rbuild" /> +</directory> </group> Removed: trunk/reactos/base/applications/utils/directory.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/dir… ============================================================================== --- trunk/reactos/base/applications/utils/directory.rbuild (original) +++ trunk/reactos/base/applications/utils/directory.rbuild (removed) @@ -1,17 +1,0 @@ -<group> -<directory name="net"> - <xi:include href="net/directory.rbuild" /> -</directory> -<directory name="getfirefox"> - <xi:include href="getfirefox/getfirefox.rbuild" /> -</directory> -<directory name="shutdown"> - <xi:include href="shutdown/shutdown.rbuild" /> -</directory> -<directory name="ps"> - <xi:include href="ps/ps.rbuild" /> -</directory> -<directory name="rosperf"> - <xi:include href="rosperf/rosperf.rbuild" /> -</directory> -</group> Added: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/utils/uti… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (added) +++ trunk/reactos/base/applications/utils/utils.rbuild Mon Apr 10 20:42:55 2006 @@ -1,0 +1,8 @@ +<group> +<directory name="ps"> + <xi:include href="ps/ps.rbuild" /> +</directory> +<directory name="rosperf"> + <xi:include href="rosperf/rosperf.rbuild" /> +</directory> +</group>

1 0

[tretiakov] 21538: [AUDIT] \trunk\reactos\base\applications\utils\rosperf (unlock) GvG (the author) confirmed it is clean.
by tretiakov＠svn.reactos.org 10 Apr '06

10 Apr '06

Author: tretiakov Date: Mon Apr 10 20:13:17 2006 New Revision: 21538 URL: http://svn.reactos.ru/svn/reactos?rev=21538&view=rev Log: [AUDIT] \trunk\reactos\base\applications\utils\rosperf (unlock) GvG (the author) confirmed it is clean. Modified: trunk/reactos/base/applications/utils/rosperf/alphablend.c (props changed) trunk/reactos/base/applications/utils/rosperf/fill.c (props changed) trunk/reactos/base/applications/utils/rosperf/lines.c (props changed) trunk/reactos/base/applications/utils/rosperf/rosperf.c (props changed) trunk/reactos/base/applications/utils/rosperf/rosperf.h (props changed) trunk/reactos/base/applications/utils/rosperf/testlist.c (props changed) trunk/reactos/base/applications/utils/rosperf/text.c (props changed) Propchange: trunk/reactos/base/applications/utils/rosperf/alphablend.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/fill.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/lines.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/rosperf.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/rosperf.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/testlist.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/utils/rosperf/text.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21537: vendor drop, stdole from Wine
by gedmurphy＠svn.reactos.org 09 Apr '06

09 Apr '06

Author: gedmurphy Date: Mon Apr 10 02:12:21 2006 New Revision: 21537 URL: http://svn.reactos.ru/svn/reactos?rev=21537&view=rev Log: vendor drop, stdole from Wine Added: vendor/wine/dlls/stdole2/ vendor/wine/dlls/stdole2/Wine-0_9_11/ vendor/wine/dlls/stdole2/Wine-0_9_11/Makefile.in vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc.rc vendor/wine/dlls/stdole2/Wine-0_9_11/std_ole_v2.idl vendor/wine/dlls/stdole2/Wine-0_9_11/stdole2.tlb.spec vendor/wine/dlls/stdole2/current/ vendor/wine/dlls/stdole2/current/Makefile.in vendor/wine/dlls/stdole2/current/rsrc.rc vendor/wine/dlls/stdole2/current/std_ole_v2.idl vendor/wine/dlls/stdole2/current/stdole2.tlb.spec vendor/wine/dlls/stdole32/ vendor/wine/dlls/stdole32/Wine-0_9_11/ vendor/wine/dlls/stdole32/Wine-0_9_11/Makefile.in vendor/wine/dlls/stdole32/Wine-0_9_11/rsrc.rc vendor/wine/dlls/stdole32/Wine-0_9_11/std_ole_v1.idl vendor/wine/dlls/stdole32/Wine-0_9_11/stdole32.tlb.spec vendor/wine/dlls/stdole32/current/ vendor/wine/dlls/stdole32/current/Makefile.in vendor/wine/dlls/stdole32/current/rsrc.rc vendor/wine/dlls/stdole32/current/std_ole_v1.idl vendor/wine/dlls/stdole32/current/stdole32.tlb.spec Added: vendor/wine/dlls/stdole2/Wine-0_9_11/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/Wine-0_9_11/Make… ============================================================================== --- vendor/wine/dlls/stdole2/Wine-0_9_11/Makefile.in (added) +++ vendor/wine/dlls/stdole2/Wine-0_9_11/Makefile.in Mon Apr 10 02:12:21 2006 @@ -1,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = stdole2.tlb +IMPORTS = kernel32 + +RC_SRCS = rsrc.rc +RC_TLB = std_ole_v2.tlb + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc… ============================================================================== --- vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc.rc (added) +++ vendor/wine/dlls/stdole2/Wine-0_9_11/rsrc.rc Mon Apr 10 02:12:21 2006 @@ -1,0 +1,30 @@ +/* + * Resource file for stdole2 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v2.tlb Added: vendor/wine/dlls/stdole2/Wine-0_9_11/std_ole_v2.idl URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/Wine-0_9_11/std_… ============================================================================== --- vendor/wine/dlls/stdole2/Wine-0_9_11/std_ole_v2.idl (added) +++ vendor/wine/dlls/stdole2/Wine-0_9_11/std_ole_v2.idl Mon Apr 10 02:12:21 2006 @@ -1,0 +1,434 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +[ + uuid(00020430-0000-0000-C000-000000000046), + version(2.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef short VARIANT_BOOL; + typedef long BSTR; + typedef double CURRENCY; + typedef unsigned long HRESULT; + typedef void *VARIANT; + typedef unsigned long SCODE; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } + + typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB), public] + unsigned long OLE_COLOR; + + typedef [uuid(66504302-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_PIXELS; + + typedef [uuid(66504303-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_PIXELS; + + typedef [uuid(66504304-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_PIXELS; + + typedef [uuid(66504305-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_PIXELS; + + typedef [uuid(66504306-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_HIMETRIC; + + typedef [uuid(66504307-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_HIMETRIC; + + typedef [uuid(66504308-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_HIMETRIC; + + typedef [uuid(66504309-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_HIMETRIC; + + typedef [uuid(BF030640-9069-101B-AE2D-08002B2EC713), public] + float OLE_XPOS_CONTAINER; + + typedef [uuid(BF030641-9069-101B-AE2D-08002B2EC713), public] + float OLE_YPOS_CONTAINER; + + typedef [uuid(BF030642-9069-101B-AE2D-08002B2EC713), public] + float OLE_XSIZE_CONTAINER; + + typedef [uuid(BF030643-9069-101B-AE2D-08002B2EC713), public] + float OLE_YSIZE_CONTAINER; + + typedef [uuid(66504313-BE0F-101A-8BBB-00AA00300CAB), public] + int OLE_HANDLE; + + typedef [uuid(6650430B-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL OLE_OPTEXCLUSIVE; + + typedef [uuid(BF030644-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_CANCELBOOL; + + typedef [uuid(BF030645-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; + + /* FIXME: widl can't cope with enum attributes yet */ + /* + [ + uuid(6650430A-BE0F-101A-8BBB-00AA00300CAB) + ] + */ + enum OLE_TRISTATE { + Unchecked = 0, + Checked = 1, + Gray = 2 + }; + + typedef [uuid(6650430D-BE0F-101A-8BBB-00AA00300CAB), public] + BSTR FONTNAME; + + typedef [uuid(6650430E-BE0F-101A-8BBB-00AA00300CAB), public] + CURRENCY FONTSIZE; + + typedef [uuid(6650430F-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTBOLD; + + typedef [uuid(66504310-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTITALIC; + + typedef [uuid(66504311-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTUNDERSCORE; + + typedef [uuid(66504312-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTSTRIKETHROUGH; + + + [ + odl, + uuid(BEF6E002-A874-101A-8BBA-00AA00300CAB), + helpstring("Font Object"), + hidden + ] + interface IFont { + [propget] HRESULT Name([out, retval] BSTR *pname); + [propput] HRESULT Name([in] BSTR pname); + + [propget] HRESULT Size([out, retval] CURRENCY *psize); + [propput] HRESULT Size([in] BSTR psize); + + [propget] HRESULT Bold([out, retval] VARIANT_BOOL *pbold); + [propput] HRESULT Bold([in] VARIANT_BOOL pbold); + + [propget] HRESULT Italic([out, retval] VARIANT_BOOL *pitalic); + [propput] HRESULT Italic([in] VARIANT_BOOL pitalic); + + [propget] HRESULT Underline([out, retval] VARIANT_BOOL *punderline); + [propput] HRESULT Underline([in] VARIANT_BOOL punderline); + + [propget] HRESULT Strikethrough([out, retval] VARIANT_BOOL *pstrikethrough); + [propput] HRESULT Strikethrough([in] VARIANT_BOOL pstrikethrough); + + [propget] HRESULT Weight([out, retval] short *pweight); + [propput] HRESULT Weight([in] short pweight); + + [propget] HRESULT Charset([out, retval] short *pcharset); + [propput] HRESULT Charset([in] short pcharset); + + [propget] HRESULT hFont([out, retval] OLE_HANDLE *phfont); + + HRESULT Clone([out] IFont **ppfont); + + HRESULT IsEqual([in] IFont *pfontOther); + + HRESULT SetRatio([in] long cyLogical, [in] long cyHimetric); + + HRESULT AddRefHfont([in] OLE_HANDLE hFont); + + HRESULT ReleaseHfont([in] OLE_HANDLE hFont); + }; + + + [ + odl, + uuid(BEF6E003-A874-101A-8BBA-00AA00300CAB) + ] + dispinterface Font { + properties: + [id(0x0)] BSTR Name; + [id(0x2)] CURRENCY Size; + [id(0x3)] VARIANT_BOOL Bold; + [id(0x4)] VARIANT_BOOL Italic; + [id(0x5)] VARIANT_BOOL Underline; + [id(0x6)] VARIANT_BOOL Strikethrough; + [id(0x7)] short Weight; + [id(0x8)] short Charset; + methods: + } + + typedef [public] Font IFontDisp; + + [ + uuid(0BE35203-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdFont { + [default] dispinterface Font; + /* FIXME: We can't reference dispinterface FontEvents here because we need it to + appear at the end of the typelib. */ +/* [default, source] dispinterface FontEvents;*/ + interface IFont; + }; + + [ + odl, + uuid(7BF80980-BF32-101A-8BBB-00AA00300CAB), + helpstring("Picture Object"), + hidden + ] + interface IPicture /*: IUnknown*/ { + [propget] HRESULT Handle([out, retval] OLE_HANDLE *phandle); + + [propget] HRESULT hPal([out, retval] OLE_HANDLE *phpal); + + [propget] HRESULT Type([out, retval] short *ptype); + + [propget] HRESULT Width([out, retval] OLE_XSIZE_HIMETRIC *pwidth); + + [propget] HRESULT Height([out, retval] OLE_YSIZE_HIMETRIC *pheight); + + HRESULT Render([in] int hdc, + [in] long x, + [in] long y, + [in] long cx, + [in] long cy, + [in] OLE_XPOS_HIMETRIC xSrc, + [in] OLE_YPOS_HIMETRIC ySrc, + [in] OLE_XSIZE_HIMETRIC cxSrc, + [in] OLE_YSIZE_HIMETRIC cySrc, + [in] void *prcWBounds); + + [propput] HRESULT hPal([in] OLE_HANDLE phpal); + + [propget] HRESULT CurDC([out, retval] int *phdcOut); + + HRESULT SelectPicture([in] int hdcIn, + [out] int *phdcOut, + [out] OLE_HANDLE *phbmpOut); + + [propget] HRESULT KeepOriginalFormat([out, retval] VARIANT_BOOL *pfkeep); + [propput] HRESULT KeepOriginalFormat([in] VARIANT_BOOL pfkeep); + + HRESULT PictureChanged(); + + HRESULT SaveAsFile([in] void *pstm, + [in] VARIANT_BOOL fSaveMemCopy, + [out] long *pcbSize); + + [propget] HRESULT Attributes([out, retval] long *pdwAttr); + + HRESULT SetHdc([in] OLE_HANDLE hdc); + }; + + [ + uuid(7BF80981-BF32-101A-8BBB-00AA00300CAB) + ] + dispinterface Picture { + properties: + [id(0x0), readonly] OLE_HANDLE Handle; + [id(0x2)] OLE_HANDLE hPal; + [id(0x3), readonly] short Type; + [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; + [id(0x5), readonly] OLE_XSIZE_HIMETRIC Height; + methods: + [id(0x6)] void Render(int hdc, + long x, + long y, + long cx, + long cy, + OLE_XPOS_HIMETRIC xSrc, + OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, + OLE_YSIZE_HIMETRIC cySrc, + void *prcWBounds); + }; + + typedef [public] Picture IPictureDisp; + + [ + uuid(0BE35204-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdPicture { + [default] dispinterface Picture; + interface IPicture; + }; + + /* FIXME: widl can't cope with enum attributes yet */ + /* + [ + uuid(E6C8FA08-BD9F-11D0-985E-00C04FC29993) + ] + */ + enum LoadPictureConstants { + Default = 0, + Monochrome = 1, + VgaColor = 2, + Color = 4 + }; + + [ + dllname("oleaut32.dll"), + uuid(91209AC0-60F6-11CF-9C5D-00AA00C1489E), + helpstring("Functions for Standard OLE Objects"), + helpcontext(0x2775) + ] + module StdFunctions{ + [ + entry("OleLoadPictureFileEx"), + helpstring("Loads a picture from a file"), + helpcontext(0x2775) + ] + HRESULT LoadPicture([in, optional] VARIANT filename, + [in, optional, defaultvalue(0)] int widthDesired, + [in, optional, defaultvalue(0)] int heightDesired, + [in, optional, defaultvalue(Default)] enum LoadPictureConstants flags, + [out, retval] IPictureDisp **retval); + [ + entry("OleSavePictureFile"), + helpstring("Saves a picture to a file"), + helpcontext(0x2775) + ] + HRESULT SavePicture([in] IPictureDisp *Picture, + [in] BSTR filename); + }; + + + [ + uuid(4EF6100A-AF88-11D0-9846-00C04FC29993), + helpstring("Event Interface for the Font Object"), + hidden + ] + dispinterface FontEvents { + properties: + methods: + [id(0x9)] void FontChanged([in] BSTR PropertyName); + }; + + typedef [public] FontEvents IFontEventsDisp; + + +}; Added: vendor/wine/dlls/stdole2/Wine-0_9_11/stdole2.tlb.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/Wine-0_9_11/stdo… ============================================================================== --- vendor/wine/dlls/stdole2/Wine-0_9_11/stdole2.tlb.spec (added) +++ vendor/wine/dlls/stdole2/Wine-0_9_11/stdole2.tlb.spec Mon Apr 10 02:12:21 2006 @@ -1,0 +1,1 @@ +# no exported entry points Added: vendor/wine/dlls/stdole2/current/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/current/Makefile… ============================================================================== --- vendor/wine/dlls/stdole2/current/Makefile.in (added) +++ vendor/wine/dlls/stdole2/current/Makefile.in Mon Apr 10 02:12:21 2006 @@ -1,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = stdole2.tlb +IMPORTS = kernel32 + +RC_SRCS = rsrc.rc +RC_TLB = std_ole_v2.tlb + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/stdole2/current/rsrc.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/current/rsrc.rc?… ============================================================================== --- vendor/wine/dlls/stdole2/current/rsrc.rc (added) +++ vendor/wine/dlls/stdole2/current/rsrc.rc Mon Apr 10 02:12:21 2006 @@ -1,0 +1,30 @@ +/* + * Resource file for stdole2 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v2.tlb Added: vendor/wine/dlls/stdole2/current/std_ole_v2.idl URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/current/std_ole_… ============================================================================== --- vendor/wine/dlls/stdole2/current/std_ole_v2.idl (added) +++ vendor/wine/dlls/stdole2/current/std_ole_v2.idl Mon Apr 10 02:12:21 2006 @@ -1,0 +1,434 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +[ + uuid(00020430-0000-0000-C000-000000000046), + version(2.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef short VARIANT_BOOL; + typedef long BSTR; + typedef double CURRENCY; + typedef unsigned long HRESULT; + typedef void *VARIANT; + typedef unsigned long SCODE; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } + + typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB), public] + unsigned long OLE_COLOR; + + typedef [uuid(66504302-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_PIXELS; + + typedef [uuid(66504303-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_PIXELS; + + typedef [uuid(66504304-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_PIXELS; + + typedef [uuid(66504305-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_PIXELS; + + typedef [uuid(66504306-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XPOS_HIMETRIC; + + typedef [uuid(66504307-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YPOS_HIMETRIC; + + typedef [uuid(66504308-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_XSIZE_HIMETRIC; + + typedef [uuid(66504309-BE0F-101A-8BBB-00AA00300CAB), public] + long OLE_YSIZE_HIMETRIC; + + typedef [uuid(BF030640-9069-101B-AE2D-08002B2EC713), public] + float OLE_XPOS_CONTAINER; + + typedef [uuid(BF030641-9069-101B-AE2D-08002B2EC713), public] + float OLE_YPOS_CONTAINER; + + typedef [uuid(BF030642-9069-101B-AE2D-08002B2EC713), public] + float OLE_XSIZE_CONTAINER; + + typedef [uuid(BF030643-9069-101B-AE2D-08002B2EC713), public] + float OLE_YSIZE_CONTAINER; + + typedef [uuid(66504313-BE0F-101A-8BBB-00AA00300CAB), public] + int OLE_HANDLE; + + typedef [uuid(6650430B-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL OLE_OPTEXCLUSIVE; + + typedef [uuid(BF030644-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_CANCELBOOL; + + typedef [uuid(BF030645-9069-101B-AE2D-08002B2EC713), public] + VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; + + /* FIXME: widl can't cope with enum attributes yet */ + /* + [ + uuid(6650430A-BE0F-101A-8BBB-00AA00300CAB) + ] + */ + enum OLE_TRISTATE { + Unchecked = 0, + Checked = 1, + Gray = 2 + }; + + typedef [uuid(6650430D-BE0F-101A-8BBB-00AA00300CAB), public] + BSTR FONTNAME; + + typedef [uuid(6650430E-BE0F-101A-8BBB-00AA00300CAB), public] + CURRENCY FONTSIZE; + + typedef [uuid(6650430F-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTBOLD; + + typedef [uuid(66504310-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTITALIC; + + typedef [uuid(66504311-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTUNDERSCORE; + + typedef [uuid(66504312-BE0F-101A-8BBB-00AA00300CAB), public] + VARIANT_BOOL FONTSTRIKETHROUGH; + + + [ + odl, + uuid(BEF6E002-A874-101A-8BBA-00AA00300CAB), + helpstring("Font Object"), + hidden + ] + interface IFont { + [propget] HRESULT Name([out, retval] BSTR *pname); + [propput] HRESULT Name([in] BSTR pname); + + [propget] HRESULT Size([out, retval] CURRENCY *psize); + [propput] HRESULT Size([in] BSTR psize); + + [propget] HRESULT Bold([out, retval] VARIANT_BOOL *pbold); + [propput] HRESULT Bold([in] VARIANT_BOOL pbold); + + [propget] HRESULT Italic([out, retval] VARIANT_BOOL *pitalic); + [propput] HRESULT Italic([in] VARIANT_BOOL pitalic); + + [propget] HRESULT Underline([out, retval] VARIANT_BOOL *punderline); + [propput] HRESULT Underline([in] VARIANT_BOOL punderline); + + [propget] HRESULT Strikethrough([out, retval] VARIANT_BOOL *pstrikethrough); + [propput] HRESULT Strikethrough([in] VARIANT_BOOL pstrikethrough); + + [propget] HRESULT Weight([out, retval] short *pweight); + [propput] HRESULT Weight([in] short pweight); + + [propget] HRESULT Charset([out, retval] short *pcharset); + [propput] HRESULT Charset([in] short pcharset); + + [propget] HRESULT hFont([out, retval] OLE_HANDLE *phfont); + + HRESULT Clone([out] IFont **ppfont); + + HRESULT IsEqual([in] IFont *pfontOther); + + HRESULT SetRatio([in] long cyLogical, [in] long cyHimetric); + + HRESULT AddRefHfont([in] OLE_HANDLE hFont); + + HRESULT ReleaseHfont([in] OLE_HANDLE hFont); + }; + + + [ + odl, + uuid(BEF6E003-A874-101A-8BBA-00AA00300CAB) + ] + dispinterface Font { + properties: + [id(0x0)] BSTR Name; + [id(0x2)] CURRENCY Size; + [id(0x3)] VARIANT_BOOL Bold; + [id(0x4)] VARIANT_BOOL Italic; + [id(0x5)] VARIANT_BOOL Underline; + [id(0x6)] VARIANT_BOOL Strikethrough; + [id(0x7)] short Weight; + [id(0x8)] short Charset; + methods: + } + + typedef [public] Font IFontDisp; + + [ + uuid(0BE35203-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdFont { + [default] dispinterface Font; + /* FIXME: We can't reference dispinterface FontEvents here because we need it to + appear at the end of the typelib. */ +/* [default, source] dispinterface FontEvents;*/ + interface IFont; + }; + + [ + odl, + uuid(7BF80980-BF32-101A-8BBB-00AA00300CAB), + helpstring("Picture Object"), + hidden + ] + interface IPicture /*: IUnknown*/ { + [propget] HRESULT Handle([out, retval] OLE_HANDLE *phandle); + + [propget] HRESULT hPal([out, retval] OLE_HANDLE *phpal); + + [propget] HRESULT Type([out, retval] short *ptype); + + [propget] HRESULT Width([out, retval] OLE_XSIZE_HIMETRIC *pwidth); + + [propget] HRESULT Height([out, retval] OLE_YSIZE_HIMETRIC *pheight); + + HRESULT Render([in] int hdc, + [in] long x, + [in] long y, + [in] long cx, + [in] long cy, + [in] OLE_XPOS_HIMETRIC xSrc, + [in] OLE_YPOS_HIMETRIC ySrc, + [in] OLE_XSIZE_HIMETRIC cxSrc, + [in] OLE_YSIZE_HIMETRIC cySrc, + [in] void *prcWBounds); + + [propput] HRESULT hPal([in] OLE_HANDLE phpal); + + [propget] HRESULT CurDC([out, retval] int *phdcOut); + + HRESULT SelectPicture([in] int hdcIn, + [out] int *phdcOut, + [out] OLE_HANDLE *phbmpOut); + + [propget] HRESULT KeepOriginalFormat([out, retval] VARIANT_BOOL *pfkeep); + [propput] HRESULT KeepOriginalFormat([in] VARIANT_BOOL pfkeep); + + HRESULT PictureChanged(); + + HRESULT SaveAsFile([in] void *pstm, + [in] VARIANT_BOOL fSaveMemCopy, + [out] long *pcbSize); + + [propget] HRESULT Attributes([out, retval] long *pdwAttr); + + HRESULT SetHdc([in] OLE_HANDLE hdc); + }; + + [ + uuid(7BF80981-BF32-101A-8BBB-00AA00300CAB) + ] + dispinterface Picture { + properties: + [id(0x0), readonly] OLE_HANDLE Handle; + [id(0x2)] OLE_HANDLE hPal; + [id(0x3), readonly] short Type; + [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; + [id(0x5), readonly] OLE_XSIZE_HIMETRIC Height; + methods: + [id(0x6)] void Render(int hdc, + long x, + long y, + long cx, + long cy, + OLE_XPOS_HIMETRIC xSrc, + OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, + OLE_YSIZE_HIMETRIC cySrc, + void *prcWBounds); + }; + + typedef [public] Picture IPictureDisp; + + [ + uuid(0BE35204-8F91-11CE-9DE3-00AA004BB851) + ] + coclass StdPicture { + [default] dispinterface Picture; + interface IPicture; + }; + + /* FIXME: widl can't cope with enum attributes yet */ + /* + [ + uuid(E6C8FA08-BD9F-11D0-985E-00C04FC29993) + ] + */ + enum LoadPictureConstants { + Default = 0, + Monochrome = 1, + VgaColor = 2, + Color = 4 + }; + + [ + dllname("oleaut32.dll"), + uuid(91209AC0-60F6-11CF-9C5D-00AA00C1489E), + helpstring("Functions for Standard OLE Objects"), + helpcontext(0x2775) + ] + module StdFunctions{ + [ + entry("OleLoadPictureFileEx"), + helpstring("Loads a picture from a file"), + helpcontext(0x2775) + ] + HRESULT LoadPicture([in, optional] VARIANT filename, + [in, optional, defaultvalue(0)] int widthDesired, + [in, optional, defaultvalue(0)] int heightDesired, + [in, optional, defaultvalue(Default)] enum LoadPictureConstants flags, + [out, retval] IPictureDisp **retval); + [ + entry("OleSavePictureFile"), + helpstring("Saves a picture to a file"), + helpcontext(0x2775) + ] + HRESULT SavePicture([in] IPictureDisp *Picture, + [in] BSTR filename); + }; + + + [ + uuid(4EF6100A-AF88-11D0-9846-00C04FC29993), + helpstring("Event Interface for the Font Object"), + hidden + ] + dispinterface FontEvents { + properties: + methods: + [id(0x9)] void FontChanged([in] BSTR PropertyName); + }; + + typedef [public] FontEvents IFontEventsDisp; + + +}; Added: vendor/wine/dlls/stdole2/current/stdole2.tlb.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole2/current/stdole2.… ============================================================================== --- vendor/wine/dlls/stdole2/current/stdole2.tlb.spec (added) +++ vendor/wine/dlls/stdole2/current/stdole2.tlb.spec Mon Apr 10 02:12:21 2006 @@ -1,0 +1,1 @@ +# no exported entry points Added: vendor/wine/dlls/stdole32/Wine-0_9_11/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/Wine-0_9_11/Mak… ============================================================================== --- vendor/wine/dlls/stdole32/Wine-0_9_11/Makefile.in (added) +++ vendor/wine/dlls/stdole32/Wine-0_9_11/Makefile.in Mon Apr 10 02:12:21 2006 @@ -1,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = stdole32.tlb +IMPORTS = kernel32 + +RC_SRCS = rsrc.rc +RC_TLB = std_ole_v1.tlb + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/stdole32/Wine-0_9_11/rsrc.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/Wine-0_9_11/rsr… ============================================================================== --- vendor/wine/dlls/stdole32/Wine-0_9_11/rsrc.rc (added) +++ vendor/wine/dlls/stdole32/Wine-0_9_11/rsrc.rc Mon Apr 10 02:12:21 2006 @@ -1,0 +1,30 @@ +/* + * Resource file for stdole32 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v1.tlb Added: vendor/wine/dlls/stdole32/Wine-0_9_11/std_ole_v1.idl URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/Wine-0_9_11/std… ============================================================================== --- vendor/wine/dlls/stdole32/Wine-0_9_11/std_ole_v1.idl (added) +++ vendor/wine/dlls/stdole32/Wine-0_9_11/std_ole_v1.idl Mon Apr 10 02:12:21 2006 @@ -1,0 +1,137 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +[ + uuid(00020430-0000-0000-C000-000000000046), + version(1.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef void *VARIANT; + typedef wchar_t *BSTR; + typedef unsigned long SCODE; + typedef unsigned long HRESULT; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } +}; Added: vendor/wine/dlls/stdole32/Wine-0_9_11/stdole32.tlb.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/Wine-0_9_11/std… ============================================================================== --- vendor/wine/dlls/stdole32/Wine-0_9_11/stdole32.tlb.spec (added) +++ vendor/wine/dlls/stdole32/Wine-0_9_11/stdole32.tlb.spec Mon Apr 10 02:12:21 2006 @@ -1,0 +1,1 @@ +# no exported entry points Added: vendor/wine/dlls/stdole32/current/Makefile.in URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/current/Makefil… ============================================================================== --- vendor/wine/dlls/stdole32/current/Makefile.in (added) +++ vendor/wine/dlls/stdole32/current/Makefile.in Mon Apr 10 02:12:21 2006 @@ -1,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = stdole32.tlb +IMPORTS = kernel32 + +RC_SRCS = rsrc.rc +RC_TLB = std_ole_v1.tlb + +@MAKE_DLL_RULES@ + +### Dependencies: Added: vendor/wine/dlls/stdole32/current/rsrc.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/current/rsrc.rc… ============================================================================== --- vendor/wine/dlls/stdole32/current/rsrc.rc (added) +++ vendor/wine/dlls/stdole32/current/rsrc.rc Mon Apr 10 02:12:21 2006 @@ -1,0 +1,30 @@ +/* + * Resource file for stdole32 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v1.tlb Added: vendor/wine/dlls/stdole32/current/std_ole_v1.idl URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/current/std_ole… ============================================================================== --- vendor/wine/dlls/stdole32/current/std_ole_v1.idl (added) +++ vendor/wine/dlls/stdole32/current/std_ole_v1.idl Mon Apr 10 02:12:21 2006 @@ -1,0 +1,137 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +[ + uuid(00020430-0000-0000-C000-000000000046), + version(1.0), + helpstring("OLE Automation") +] +library stdole +{ + /* typedefs aren't stored in the type library. + These type names are known by the type compiler so it + doesn't really matter what we define them as. */ + + typedef void *VARIANT; + typedef wchar_t *BSTR; + typedef unsigned long SCODE; + typedef unsigned long HRESULT; + + typedef struct GUID { + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned char Data4[ 8 ]; + } GUID; + + typedef struct DISPPARAMS { + VARIANT *rgvarg; + long *rgdispidNamedArgs; + unsigned int cArgs; + unsigned int cNamedArgs; + } DISPPARAMS; + + typedef struct EXCEPINFO { + unsigned short wCode; + unsigned short wReserved; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + unsigned long dwHelpContext; + void *pvReserved; + void *pfnDeferredFillIn; + SCODE scode; + } EXCEPINFO; + + [ + odl, + uuid(00000000-0000-0000-C000-000000000046) + ] + interface IUnknown + { + [restricted] + HRESULT QueryInterface( + [in] GUID *riid, + [out] void **ppvObj); + + [restricted] + unsigned long AddRef(); + + [restricted] + unsigned long Release(); + } + + [ + odl, + uuid(00020400-0000-0000-C000-000000000046) + ] + interface IDispatch : IUnknown + { + [restricted] + HRESULT GetTypeInfoCount( + [out] unsigned int *pctinfo); + + [restricted] + HRESULT GetTypeInfo( + [in] unsigned int itinfo, + [in] unsigned long lcid, + [out] void **pptinfo); + + [restricted] + HRESULT GetIDsOfNames( + [in] GUID *riid, + [in] char **rgszNames, + [in] unsigned int cNames, + [in] unsigned long lcid, + [out] long *rgdispid); + + [restricted] + HRESULT Invoke( + [in] long dispidMember, + [in] GUID *riid, + [in] unsigned long lcid, + [in] unsigned short wFlags, + [in] DISPPARAMS *pdispparams, + [out] VARIANT *pvarResult, + [out] EXCEPINFO *pexcepinfo, + [out] unsigned int *puArgErr); + + } + + [ + odl, + uuid(00020404-0000-0000-C000-000000000046) + ] + interface IEnumVARIANT : IUnknown + { + HRESULT Next( + [in] unsigned long celt, + [in] VARIANT *rgvar, + [out] unsigned long *pceltFetched); + + HRESULT Skip( + [in] unsigned long celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumVARIANT **ppenum); + } +}; Added: vendor/wine/dlls/stdole32/current/stdole32.tlb.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/stdole32/current/stdole3… ============================================================================== --- vendor/wine/dlls/stdole32/current/stdole32.tlb.spec (added) +++ vendor/wine/dlls/stdole32/current/stdole32.tlb.spec Mon Apr 10 02:12:21 2006 @@ -1,0 +1,1 @@ +# no exported entry points

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
33
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2006