Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[dreimer] 27227: Added ability to the SVN Client to show the recent online and offline Revision Number to compare. This takes ~10 seconds, so my plan to add it to main menu was canceled. But as "svn status" is has a nice place.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jun 19 00:18:34 2007 New Revision: 27227 URL: http://svn.reactos.org/svn/reactos?rev=27227&view=rev Log: Added ability to the SVN Client to show the recent online and offline Revision Number to compare. This takes ~10 seconds, so my plan to add it to main menu was canceled. But as "svn status" is has a nice place. Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Tue Jun 19 00:18:34 2007 @@ -26,7 +26,7 @@ echo help [COMMAND] - Display the available commands or help on a echo specific command. echo svn [OPTIONS] - Create, Update or clean up your ReactOS Source - echo Tree. + echo Tree or show the Status. echo config [OPTIONS]- Configures the way, ReactOS will be built. echo. echo basedir - Switch back to the ReactOS source directory. @@ -64,10 +64,12 @@ echo Usage: svn [OPTIONS] echo Creates, Updates or cleans up your ReactOS Source Tree. echo. - echo update - Updates to HEAD Revision or to a specific one when - echo second parameter specifies one. - echo create - Creates a new ReactOS Tree. + echo update - Updates to HEAD Revision or to a specific one when + echo second parameter specifies one. + echo create - Creates a new ReactOS Tree. echo cleanup - Cleans up and fixes errors in Tree. + echo status - Shows Actual offline Revision Number and online HEAD + echo Revision Number. goto :EOF ) if "%1" == "config" ( Modified: trunk/tools/RosBE-Windows/Root/SVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r… ============================================================================== --- trunk/tools/RosBE-Windows/Root/SVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd Tue Jun 19 00:18:34 2007 @@ -36,6 +36,20 @@ goto :SVN ) ) +if "%1" == "status" ( + title Status + call "%ROSBEBASEDIR%\Tools\svn.exe" info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp" + echo Recent Offline Revision: + call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + del "%ROSBEBASEDIR%\x.tmp" + + call "%ROSBEBASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" + echo Online HEAD Revision: + call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + del "%ROSBEBASEDIR%\x.tmp" + goto :ExitSVN +) + if not "%1" == "" ( echo Unknown parameter specified. Try 'help [COMMAND]'. goto :ExitSVN

17 years, 6 months

[greatlrd] 27226: Fixed some smaller bugs

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jun 18 22:11:39 2007 New Revision: 27226 URL: http://svn.reactos.org/svn/reactos?rev=27226&view=rev Log: Fixed some smaller bugs Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 22:11:39 2007 @@ -24,8 +24,6 @@ Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { - DDSURFACEDESC2 desc; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface = { 0 }; DDHAL_CREATESURFACEDATA mDdCreateSurface = { 0 }; @@ -158,6 +156,16 @@ ThisSurfaceGbl->wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; ThisSurfaceGbl->lPitch = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; ThisSurfaceGbl->dwLinearSize = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; + + + ThisSurfaceMore->dmiDDrawReserved7.wWidth = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayWidth; + ThisSurfaceMore->dmiDDrawReserved7.wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; + ThisSurfaceMore->dmiDDrawReserved7.wBPP = pDDraw->lpLcl->lpGbl->dwMonitorFrequency; + + /* FIXME ThisSurfaceMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop */ + ThisSurfaceMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop = 1; + pDDraw->lpLcl->lpPrimary = ThisSurfInt; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)pDDraw); } else { @@ -180,6 +188,8 @@ /* FIXME the lpLnk */ /* FIXME the ref counter */ + + Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)ThisSurfInt); } /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ @@ -207,7 +217,7 @@ mDdCreateSurface.lpDD = pDDraw->lpLcl->lpGbl; mDdCreateSurface.CreateSurface = pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.CreateSurface; mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = slist_int[0]->dwIntRefCnt + 1; // is this correct + mDdCreateSurface.dwSCnt = num_of_surf; mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; mDdCreateSurface.lplpSList = slist_lcl; @@ -234,343 +244,4 @@ dst_pDesc->dwSize = sizeof(DDSURFACEDESC2); } -HRESULT -CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT That, - LPDDRAWI_DDRAWSURFACE_LCL lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - - - DxHeapMemAlloc( That->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That->lpLcl->lpSurfMore == NULL) - { - DxHeapMemFree(That); - return DDERR_OUTOFMEMORY; - } - - // That->lpLcl->lpSurfMore->slist = lpLcl; - - That->lpVtbl = &DirectDrawSurface7_Vtable; - That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That->lpLcl->lpSurfMore->lpDD_int = This; - That->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That->lpLcl->lpSurfMore->slist[0] = That->lpLcl; - That->lpLcl->dwProcessId = GetCurrentProcessId(); - - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - if (pDDSD->dwFlags & DDSD_PIXELFORMAT) - { - That->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - } - else - { - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - } - mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.ddRVal = DDERR_GENERIC; - - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That->dwIntRefCnt + 1; // is this correct - mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - - mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - - That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - That->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That; - - return DD_OK; -} - -HRESULT -CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - DWORD t; - - - /* we are building the backbuffersurface pointer list - * and create the backbuffer surface and set it up - */ - - That[0]->lpLcl->dwBackBufferCount = pDDSD->dwBackBufferCount; - - for (t=0;t<pDDSD->dwBackBufferCount+1;t++) - { - - - DxHeapMemAlloc(That[t]->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That[t]->lpLcl->lpSurfMore == NULL) - { - DxHeapMemFree(That); - return DDERR_OUTOFMEMORY; - } - - That[t]->lpLcl->lpSurfMore->slist = lpLcl; - - That[t]->lpVtbl = &DirectDrawSurface7_Vtable; - That[t]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That[t]->lpLcl->lpSurfMore->lpDD_int = This; - That[t]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That[t]->lpLcl->lpSurfMore->slist[0] = That[t]->lpLcl; - That[t]->lpLcl->dwProcessId = GetCurrentProcessId(); - - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - if (pDDSD->dwFlags & DDSD_PIXELFORMAT) - { - That[t]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - } - else - { - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - } - mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.ddRVal = DDERR_GENERIC; - - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That[t]->dwIntRefCnt + 1; // is this correct - mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - - mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist; - - That[t]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That[0]; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That[t]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - /* Build the linking buffer */ - That[t]->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That[t]; -DX_STUB_str( "ok"); - } - return DD_OK; -} - - - -HRESULT -CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDSURFACEDESC2 pDDSD) -{ - DDSURFACEDESC mddsdOverlay; - DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; - DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; - DDRAWI_DDRAWSURFACE_LCL *mpOverlayLocals[6]; - DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6]; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - INT i; - INT j; - INT cSurfaces; - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - - /* create overlay surface now */ - ZeroMemory(&mddsdOverlay, sizeof(DDSURFACEDESC)); - mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - - mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - mddsdOverlay.dwWidth = 100; //pels; - mddsdOverlay.dwHeight = 100; // lines; - mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; - mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; - - - //DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &mddsdOverlay; // pDDSD; - - - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - // derr(L"DirectDrawImpl[%08x]::__createPrimary Cannot create primary [%08x]", this, rv); - // printf("Fail to mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED \n"); - DX_STUB_str("mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - DX_STUB_str("mDdCanCreateSurface fail"); -// printf("Fail to mDdCanCreateSurface mDdCanCreateSurface.ddRVal = %d:%s\n",(int)mDdCanCreateSurface.ddRVal,DDErrorString(mDdCanCreateSurface.ddRVal)); - return DDERR_NOTINITIALIZED; - } - - - ZeroMemory(&mOverlayGlobal, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - mOverlayGlobal.dwGlobalFlags = 0; - mOverlayGlobal.lpDD = This->lpLcl->lpGbl; - mOverlayGlobal.lpDDHandle = This->lpLcl->lpGbl; - mOverlayGlobal.wWidth = (WORD)mddsdOverlay.dwWidth; - mOverlayGlobal.wHeight = (WORD)mddsdOverlay.dwHeight; - mOverlayGlobal.lPitch = -1; - mOverlayGlobal.ddpfSurface = mddsdOverlay.ddpfPixelFormat; - - // setup front- and backbuffer surfaces - cSurfaces = mddsdOverlay.dwBackBufferCount + 1; - for ( i = 0; i < cSurfaces; i++) - { - ZeroMemory(&mOverlayMore[i], sizeof(DDRAWI_DDRAWSURFACE_MORE)); - mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - ZeroMemory(&mOverlayLocal[i], sizeof(DDRAWI_DDRAWSURFACE_LCL)); - mOverlayLocal[i].lpGbl = &mOverlayGlobal; - mOverlayLocal[i].lpSurfMore = &mOverlayMore[i]; - mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); - mOverlayLocal[i].dwFlags = (i == 0) ? - (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): - (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); - - mOverlayLocal[i].dwFlags |= - DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| - DDRAWISURF_HASPIXELFORMAT| - DDRAWISURF_HASOVERLAYDATA; - - mOverlayLocal[i].ddsCaps.dwCaps = mddsdOverlay.ddsCaps.dwCaps; - mpOverlayLocals[i] = &mOverlayLocal[i]; - } - - for ( i = 0; i < cSurfaces; i++) - { - j = (i + 1) % cSurfaces; - - - /*if (!mHALInfo.lpDDSurfaceCallbacks->AddAttachedSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); - return DD_FALSE; - }*/ - - if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); -//printf("Fail to DdAttachSurface (%d:%d)\n", i, j); - DX_STUB_str("DdAttachSurface fail"); - return DD_FALSE; - } - - } - - // DDHAL_CREATESURFACEDATA mDdCreateSurface; - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &mddsdOverlay;//pDDSD; - mDdCreateSurface.lplpSList = mpOverlayLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str("mDdCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; - } - - - if (mDdCreateSurface.ddRVal != DD_OK) - { - DX_STUB_str("mDdCreateSurface fail"); - return mDdCreateSurface.ddRVal; - } - - mDdUpdateOverlay.lpDD = This->lpLcl->lpGbl; - mDdUpdateOverlay.UpdateOverlay = This->lpLcl->lpDDCB->HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = This->lpLcl->lpPrimary->lpLcl->lpSurfMore->slist[0]; - mDdUpdateOverlay.lpDDSrcSurface = 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) - { - DX_STUB_str("UpdateOverlay fail"); - return DDERR_NOTINITIALIZED; - } - - - if (mDdUpdateOverlay.ddRVal != DD_OK) - { - DX_STUB_str("mDdUpdateOverlay fail"); - //printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); - return mDdUpdateOverlay.ddRVal; - } - - DX_STUB_str("OK"); - return DD_OK; -} + Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Mon Jun 18 22:11:39 2007 @@ -209,7 +209,7 @@ This->lpLcl->lpSurfMore->slist[0]->hDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC; mdLock.ddRVal = DDERR_NOTPALETTIZED; - mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Lock; + mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Lock; mdLock.dwFlags = flags; mdLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; mdLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; @@ -278,7 +278,7 @@ mdUnLock.ddRVal = DDERR_NOTPALETTIZED; mdUnLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; mdUnLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; - mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Unlock; + mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Unlock; if (!DdResetVisrgn( mdUnLock.lpDDSurface, NULL)) {

17 years, 6 months

[dreimer] 27225: Fix buildtime

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jun 18 19:40:27 2007 New Revision: 27225 URL: http://svn.reactos.org/svn/reactos?rev=27225&view=rev Log: Fix buildtime Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/buildtim… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/buildtime.c (original) +++ trunk/tools/RosBE-Windows/Tools/buildtime.c Mon Jun 18 19:40:27 2007 @@ -8,6 +8,7 @@ */ +#include <windows.h> #include <time.h> #include <stdio.h> #include <stdlib.h>

17 years, 6 months

[mbosma] 27224: - Some formatting fixes - Some checks and fixed return values

by mbosma＠svn.reactos.org

Author: mbosma Date: Mon Jun 18 18:58:44 2007 New Revision: 27224 URL: http://svn.reactos.org/svn/reactos?rev=27224&view=rev Log: - Some formatting fixes - Some checks and fixed return values Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Mon Jun 18 18:58:44 2007 @@ -489,7 +489,7 @@ } _SEH_HANDLE { - ret = DDERR_GENERIC; + ret = DDERR_INVALIDPARAMS; } _SEH_END; // LeaveCriticalSection(&ddcs); @@ -502,24 +502,22 @@ Main_DirectDraw_CreateSurface4(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { - HRESULT ret; + HRESULT ret; DX_WINDBG_trace(); // EnterCriticalSection(&ddcs); _SEH_TRY { ret = Internal_CreateSurface( (LPDDRAWI_DIRECTDRAW_INT)iface,pDDSD, ppSurf,pUnkOuter); } - _SEH_HANDLE - { - ret = DDERR_GENERIC; + _SEH_HANDLE + { + ret = DDERR_INVALIDPARAMS; } _SEH_END; // LeaveCriticalSection(&ddcs); return ret; } - - /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ /* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */ Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 18:58:44 2007 @@ -41,8 +41,33 @@ DWORD num_of_surf=1; DWORD count; - /* Fixme adding vaidlate of income param */ + if(pDDraw->lpLcl->dwLocalFlags == 0x20000) + { + return DDERR_NOCOOPERATIVELEVELSET; + } + + if(pUnkOuter) + { + return CLASS_E_NOAGGREGATION; + } + + if(!pDDSD->dwFlags & DDSD_CAPS) + { + return DDERR_INVALIDPARAMS; + } + + if(!(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->dwFlags & DDSD_HEIGHT) + && !(pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + { + return DDERR_INVALIDPARAMS; + } + + else if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwFlags & DDSD_HEIGHT + && pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + return DDERR_INVALIDPARAMS; + } /* FIXME count our how many surface we need */ @@ -74,9 +99,6 @@ DxHeapMemFree(slist_int); return DDERR_OUTOFMEMORY; } - - - for( count=0; count < num_of_surf; count++ ) { @@ -156,13 +178,9 @@ ThisSurfLcl->dwProcessId = GetCurrentProcessId(); - - - /* FIXME the lpLnk */ /* FIXME the ref counter */ } - /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ @@ -180,11 +198,11 @@ return DDERR_NOTINITIALIZED; } - if (mDdCanCreateSurface.ddRVal != DD_OK) - { + if (mDdCanCreateSurface.ddRVal != DD_OK) + { DX_STUB_str("mDdCanCreateSurface fail"); return DDERR_NOTINITIALIZED; - } + } mDdCreateSurface.lpDD = pDDraw->lpLcl->lpGbl; mDdCreateSurface.CreateSurface = pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.CreateSurface; @@ -195,12 +213,12 @@ if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { - return DDERR_NOTINITIALIZED; + return DDERR_NOTINITIALIZED; } if (mDdCreateSurface.ddRVal != DD_OK) { - return mDdCreateSurface.ddRVal; + return mDdCreateSurface.ddRVal; } *ppSurf = &slist_int[0]->lpVtbl; @@ -233,7 +251,7 @@ return DDERR_OUTOFMEMORY; } - // That->lpLcl->lpSurfMore->slist = lpLcl; + // That->lpLcl->lpSurfMore->slist = lpLcl; That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); @@ -263,38 +281,38 @@ mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - - That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - That->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That; - - return DD_OK; + + That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; + + This->lpLcl->lpPrimary = That; + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + return DDERR_NOTINITIALIZED; + } + + mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; + + if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } + + That->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; + + That->lpLink = This->lpLcl->lpGbl->dsList; + This->lpLcl->lpGbl->dsList = That; + + return DD_OK; } HRESULT @@ -398,7 +416,6 @@ LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD) { - DDSURFACEDESC mddsdOverlay; DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; @@ -487,21 +504,21 @@ { j = (i + 1) % cSurfaces; - + /*if (!mHALInfo.lpDDSurfaceCallbacks->AddAttachedSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { + { // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); return DD_FALSE; }*/ - if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { + if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) + { // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); //printf("Fail to DdAttachSurface (%d:%d)\n", i, j); DX_STUB_str("DdAttachSurface fail"); return DD_FALSE; } - + } // DDHAL_CREATESURFACEDATA mDdCreateSurface; @@ -513,14 +530,14 @@ if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { - DX_STUB_str("mDdCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; + DX_STUB_str("mDdCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); + return DDERR_NOTINITIALIZED; } if (mDdCreateSurface.ddRVal != DD_OK) { - DX_STUB_str("mDdCreateSurface fail"); + DX_STUB_str("mDdCreateSurface fail"); return mDdCreateSurface.ddRVal; } @@ -540,20 +557,17 @@ mDdUpdateOverlay.rSrc.right = 50; mDdUpdateOverlay.rSrc.bottom = 50; - - - if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) { - DX_STUB_str("UpdateOverlay fail"); - return DDERR_NOTINITIALIZED; + DX_STUB_str("UpdateOverlay fail"); + return DDERR_NOTINITIALIZED; } if (mDdUpdateOverlay.ddRVal != DD_OK) { DX_STUB_str("mDdUpdateOverlay fail"); - //printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); + //printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); return mDdUpdateOverlay.ddRVal; }

17 years, 6 months

[cfinck] 27223: Fix bug #2312 and add a check to show only the relevant information for Windows/Unix users See issue #2312 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jun 18 15:58:35 2007 New Revision: 27223 URL: http://svn.reactos.org/svn/reactos?rev=27223&view=rev Log: Fix bug #2312 and add a check to show only the relevant information for Windows/Unix users See issue #2312 for more details. Modified: trunk/rosapps/makefile Modified: trunk/rosapps/makefile URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/makefile?rev=27223&r1=2722… ============================================================================== --- trunk/rosapps/makefile (original) +++ trunk/rosapps/makefile Mon Jun 18 15:58:35 2007 @@ -3,11 +3,18 @@ @echo --- @echo 1. copy the rosapps folder into the reactos\modules folder @echo 2. link reactos/modules/rosapps to rosapps - @echo UNIX - @echo cd $${ROS_SRC_ROOT}/reactos/modules - @echo ln -s $${ROS_SRC_ROOT}/rosapps rosapps - @echo WINDOWS - @echo cd %%ROS_SRC_ROOT%%\reactos\modules - @echo junction rosapps %%ROS_SRC_ROOT%%\rosapps + +ifeq ($(shell uname),) +# Information for Windows users + + @echo cd %%_ROSSOURCEDIR%%\reactos\modules + @echo junction rosapps %%_ROSSOURCEDIR%%\rosapps +else +# Information for UNIX users + + @echo " cd \$$_ROSSOURCEDIR/reactos/modules" + @echo " ln -s \$$_ROSSOURCEDIR/rosapps rosapps" +endif + @echo --- @echo Eventually you can run "make depends" in the \reactos directory to compile it.

17 years, 6 months

[cwittich] 27222: added explorer-like addressbar

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jun 18 04:09:37 2007 New Revision: 27222 URL: http://svn.reactos.org/svn/reactos?rev=27222&view=rev Log: added explorer-like addressbar Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/main.h Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Mon Jun 18 04:09:37 2007 @@ -71,8 +71,9 @@ SetRect(&rt, 0, 0, cx, cy); cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2; - DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx , rt.top, rt.right-cx, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left, 23, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + 25, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top - 30, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx , rt.top + 25, rt.right-cx, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); } @@ -253,6 +254,28 @@ } } + +LRESULT CALLBACK AddressBarProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldwndproc; + static TCHAR s_szNode[256]; + oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWL_USERDATA); + + switch (uMsg) + { + case WM_KEYUP: + if (wParam == VK_RETURN) + { + GetWindowText(hwnd, s_szNode, sizeof(s_szNode) / sizeof(s_szNode[0])); + SelectNode(g_pChildWnd->hTreeWnd, s_szNode); + } + break; + default: + break; + } + return CallWindowProc(oldwndproc, hwnd, uMsg, wParam, lParam); +} + /******************************************************************************* * * FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG) @@ -273,6 +296,7 @@ switch (message) { case WM_CREATE: { + WNDPROC oldproc; TCHAR buffer[MAX_PATH]; /* load "My Computer" string */ LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR)); @@ -283,10 +307,18 @@ _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH); pChildWnd->nSplitPos = 250; pChildWnd->hWnd = hWnd; - pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW); + pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hWnd, (HMENU)0, hInst, 0); + pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW); pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/); SetFocus(pChildWnd->hTreeWnd); - break; + + /* Subclass the AddressBar */ + oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC); + SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_USERDATA, (DWORD_PTR)oldproc); + SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC, (DWORD_PTR)AddressBarProc); + break; } case WM_COMMAND: if (!_CmdWndProc(hWnd, message, wParam, lParam)) { @@ -424,6 +456,7 @@ if (fullPath) { _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath); SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath); + SendMessage(pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); { Modified: trunk/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.h (original) +++ trunk/reactos/base/applications/regedit/main.h Mon Jun 18 04:09:37 2007 @@ -57,6 +57,7 @@ HWND hWnd; HWND hTreeWnd; HWND hListWnd; + HWND hAddressBarWnd; int nFocusPanel; /* 0: left 1: right */ int nSplitPos; WINDOWPLACEMENT pos;

17 years, 6 months

[greatlrd] 27221: Time to cellbrate we got bltblt hal working again 1. Createsurface can only create one surface at moment 2. crash can occured if wrong param are being putin to createsurface for no error check are done. 3. createsurface are still under havy devloping

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jun 18 03:43:21 2007 New Revision: 27221 URL: http://svn.reactos.org/svn/reactos?rev=27221&view=rev Log: Time to cellbrate we got bltblt hal working again 1. Createsurface can only create one surface at moment 2. crash can occured if wrong param are being putin to createsurface for no error check are done. 3. createsurface are still under havy devloping Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 03:43:21 2007 @@ -121,8 +121,29 @@ ThisSurfInt->lpLcl = ThisSurfLcl; ThisSurfLcl->lpGbl = ThisSurfaceGbl; + + ThisSurfLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; + ThisSurfaceGbl->lpDD = pDDraw->lpLcl->lpGbl; - + ThisSurfaceGbl->lpDDHandle = pDDraw->lpLcl->lpGbl; + + /* FIXME ? */ + ThisSurfaceGbl->dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + ThisSurfaceGbl->wWidth = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayWidth; + ThisSurfaceGbl->wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; + ThisSurfaceGbl->lPitch = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; + ThisSurfaceGbl->dwLinearSize = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; + } + else + { + ThisSurfaceGbl->wWidth = (WORD)pDDSD->dwWidth; + ThisSurfaceGbl->wHeight = (WORD)pDDSD->dwHeight; + ThisSurfaceGbl->lPitch = pDDSD->lPitch; + ThisSurfaceGbl->dwLinearSize = pDDSD->lPitch; + } /* FIXME set right version */ ThisSurfInt->lpVtbl = &DirectDrawSurface7_Vtable; @@ -135,6 +156,9 @@ ThisSurfLcl->dwProcessId = GetCurrentProcessId(); + + + /* FIXME the lpLnk */ /* FIXME the ref counter */ } @@ -142,10 +166,48 @@ /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ + /* FIXME bIsDifferentPixelFormat being set to true or false with automatic detcitons */ + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + + mDdCanCreateSurface.lpDD = pDDraw->lpLcl->lpGbl; + mDdCanCreateSurface.CanCreateSurface = pDDraw->lpLcl->lpDDCB->HALDD.CanCreateSurface; + mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; + mDdCanCreateSurface.ddRVal = DDERR_GENERIC; + + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + DX_STUB_str("mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + DX_STUB_str("mDdCanCreateSurface fail"); + return DDERR_NOTINITIALIZED; + } + + mDdCreateSurface.lpDD = pDDraw->lpLcl->lpGbl; + mDdCreateSurface.CreateSurface = pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.CreateSurface; + mDdCreateSurface.ddRVal = DDERR_GENERIC; + mDdCreateSurface.dwSCnt = slist_int[0]->dwIntRefCnt + 1; // is this correct + mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; + mDdCreateSurface.lplpSList = slist_lcl; + + if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } *ppSurf = &slist_int[0]->lpVtbl; - return DD_FALSE; + return DD_OK; } + + void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) { Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Mon Jun 18 03:43:21 2007 @@ -80,7 +80,7 @@ DX_WINDBG_trace(); - if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags + if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT) != DDHAL_SURFCB32_BLT) { return DDERR_GENERIC; @@ -95,7 +95,7 @@ } mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; - mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Blt; + mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Blt; mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; ThisDest->lpLcl->lpSurfMore->slist[0]->hDC =

17 years, 6 months

[greatlrd] 27220: last commit for today fixing some compile warings for ddraw.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jun 18 02:11:08 2007 New Revision: 27220 URL: http://svn.reactos.org/svn/reactos?rev=27220&view=rev Log: last commit for today fixing some compile warings for ddraw. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Mon Jun 18 02:11:08 2007 @@ -266,4 +266,5 @@ _SEH_END; return retVal; -} +} + Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 02:11:08 2007 @@ -121,11 +121,13 @@ ThisSurfInt->lpLcl = ThisSurfLcl; ThisSurfLcl->lpGbl = ThisSurfaceGbl; - ThisSurfLcl->lpSurfMore = ThisSurfaceMore; + ThisSurfaceGbl->lpDD = pDDraw->lpLcl->lpGbl; + /* FIXME set right version */ ThisSurfInt->lpVtbl = &DirectDrawSurface7_Vtable; + ThisSurfLcl->lpSurfMore = ThisSurfaceMore; ThisSurfaceMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); ThisSurfaceMore->lpDD_int = pDDraw; ThisSurfaceMore->lpDD_lcl = pDDraw->lpLcl;

17 years, 6 months

[arty] 27219: Fix getting .idata and .edata addresses. Keep freeldr linkage up to date. ldscript -- don't sort .idata$2 so we get modules linked in natural order.

by arty＠svn.reactos.org

Author: arty Date: Mon Jun 18 02:05:45 2007 New Revision: 27219 URL: http://svn.reactos.org/svn/reactos?rev=27219&view=rev Log: Fix getting .idata and .edata addresses. Keep freeldr linkage up to date. ldscript -- don't sort .idata$2 so we get modules linked in natural order. Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/header.h branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h branches/powerpc/reactos/tools/ppc-build/ldscript branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp Mon Jun 18 02:05:45 2007 @@ -169,6 +169,8 @@ args.insert(args.begin()+2,ldscript); args.insert(args.begin()+1,"--emit-relocs"); args.insert(args.begin()+1,"-dc"); + args.insert(args.begin()+1,"-z"); + args.insert(args.begin()+2,"defs"); args.insert(args.begin()+1,"-r"); for( size_t i = 0; i < args.size(); i++ ) { Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp Mon Jun 18 02:05:45 2007 @@ -83,9 +83,9 @@ le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 10); // # Directories // "Directories" - le32pwrite_postinc(dataptr, getExportInfo()); - le32pwrite_postinc(dataptr, getImportInfo()); - le32pwrite_postinc(dataptr, getResourceInfo()); + le32pwrite_postinc(dataptr, getExportInfo(sectionRvaSet)); + le32pwrite_postinc(dataptr, getImportInfo(sectionRvaSet)); + le32pwrite_postinc(dataptr, getResourceInfo(sectionRvaSet)); le32pwrite_postinc(dataptr, getExceptionInfo()); le32pwrite_postinc(dataptr, getSecurityInfo()); le32pwrite_postinc(dataptr, getRelocInfo()); @@ -155,28 +155,37 @@ return IMAGE_FILE_MACHINE_POWERPCBE; /* for now */ } -u32pair_t getNamedSectionInfo(ElfObjectFile *eof, const std::string &name) +u32pair_t getNamedSectionInfo(ElfObjectFile *eof, const std::vector<section_mapping_t> &mapping, const std::string &name) { const ElfObjectFile::Section *sect = eof->getNamedSection(name); + uint32_t sectaddr; + int i; + if(sect) - return std::make_pair(sect->getStartRva(), sect->logicalSize()); - else - return std::make_pair(0,0); -} - -u32pair_t ElfPeHeader::getExportInfo() const -{ - return getNamedSectionInfo(eof, ".edata"); -} - -u32pair_t ElfPeHeader::getImportInfo() const -{ - return getNamedSectionInfo(eof, ".idata"); -} - -u32pair_t ElfPeHeader::getResourceInfo() const -{ - return getNamedSectionInfo(eof, ".rsrc"); + { + for(i = 0; i < mapping.size(); i++) + if(mapping[i].index == sect->getNumber()) + { + return std::make_pair + (mapping[i].rva, sect->logicalSize()); + } + } + return std::make_pair(0,0); +} + +u32pair_t ElfPeHeader::getExportInfo(const std::vector<section_mapping_t> &mapping) const +{ + return getNamedSectionInfo(eof, mapping, ".edata"); +} + +u32pair_t ElfPeHeader::getImportInfo(const std::vector<section_mapping_t> &mapping) const +{ + return getNamedSectionInfo(eof, mapping, ".idata"); +} + +u32pair_t ElfPeHeader::getResourceInfo(const std::vector<section_mapping_t> &mapping) const +{ + return getNamedSectionInfo(eof, mapping, ".rsrc"); } u32pair_t ElfPeHeader::getExceptionInfo() const @@ -215,7 +224,7 @@ } uint32_t ElfPeHeader::getEntryPoint -(const std::vector<ElfPeHeader::section_mapping_t> &secmap, +(const std::vector<section_mapping_t> &secmap, const ElfObjectFile::Symbol *entry) const { if(entry == NULL) return computeSize(); Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/header.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/header.h Mon Jun 18 02:05:45 2007 @@ -6,6 +6,18 @@ #include "pedef.h" #include "util.h" #include "objectfile.h" + +typedef struct section_mapping_t { + const ElfObjectFile::Section *section; + uint32_t rva; + int index; + + section_mapping_t + (const ElfObjectFile::Section *sect, uint32_t rva, int index) : + section(sect), rva(rva), index(index) { } + section_mapping_t(const section_mapping_t &other) : + section(other.section), rva(other.rva), index(other.index) { } +} section_mapping_t; class ElfPeHeader { public: @@ -24,27 +36,15 @@ const ElfObjectFile::secdata_t &getData() const; private: - typedef struct section_mapping_t { - const ElfObjectFile::Section *section; - uint32_t rva; - int index; - - section_mapping_t - (const ElfObjectFile::Section *sect, uint32_t rva, int index) : - section(sect), rva(rva), index(index) { } - section_mapping_t(const section_mapping_t &other) : - section(other.section), rva(other.rva), index(other.index) { } - } section_mapping_t; - void createHeaderSection(); uint32_t getSectionRvas(std::vector<section_mapping_t> &rvas) const; uint32_t getEntryPoint(const std::vector<section_mapping_t> &rvas, const ElfObjectFile::Symbol *entry) const; int computeSize() const; int getExeFlags() const { return 0; } int getDllFlags() const { return dll ? IMAGE_FILE_DLL : 0; } - u32pair_t getExportInfo() const; - u32pair_t getImportInfo() const; - u32pair_t getResourceInfo() const; + u32pair_t getExportInfo(const std::vector<section_mapping_t> &rvas) const; + u32pair_t getImportInfo(const std::vector<section_mapping_t> &rvas) const; + u32pair_t getResourceInfo(const std::vector<section_mapping_t> &rvas) const; u32pair_t getExceptionInfo() const; u32pair_t getSecurityInfo() const; u32pair_t getRelocInfo() const; Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp Mon Jun 18 02:05:45 2007 @@ -28,7 +28,7 @@ { s = elf_nextscn(elfHeader, s); if(!s) break; - sect = new Section(*this, s); + sect = new Section(*this, i, s); sections.push_back(sect); sections_by_name.insert(std::make_pair(sect->getName(), sect)); } Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h Mon Jun 18 02:05:45 2007 @@ -24,11 +24,12 @@ class Section { public: Section(const Section &other) : - obj(other.obj), section(other.section), have_data(false) { + obj(other.obj), section(other.section), have_data(false), + number(other.number) { e32shdr = elf32_getshdr(section); } - Section(ElfObjectFile &obj, Elf_Scn *sechdr) : - obj(&obj), section(sechdr), have_data(false) { + Section(ElfObjectFile &obj, int number, Elf_Scn *sechdr) : + obj(&obj), section(sechdr), have_data(false), number(number) { e32shdr = elf32_getshdr(section); } Section &operator = (const Section &other) { @@ -36,6 +37,7 @@ have_data = false; section = other.section; e32shdr = other.e32shdr; + number = other.number; } operator bool () { return !!section; } std::string getName() const { @@ -44,6 +46,10 @@ int getType() const { return e32shdr->sh_type; + } + + int getNumber() const { + return number; } int getLink() const { @@ -80,6 +86,7 @@ private: const ElfObjectFile *obj; + int number; Elf_Scn *section; Elf32_Shdr *e32shdr; mutable bool have_data; Modified: branches/powerpc/reactos/tools/ppc-build/ldscript URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/ldscript (original) +++ branches/powerpc/reactos/tools/ppc-build/ldscript Mon Jun 18 02:05:45 2007 @@ -28,7 +28,7 @@ } .idata : { - SORT(*)(.idata$2) + *(.idata$2) SORT(*)(.idata$3) LONG(0); LONG(0); LONG(0); LONG(0); LONG(0); SORT(*)(.idata$4) Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Mon Jun 18 02:05:45 2007 @@ -53,6 +53,7 @@ obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/loader.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_ide.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_pci.o \

17 years, 6 months

[greatlrd] 27218: 1. fixed typo in DD->GetCaps 2. Started implement Createsurface for real this time. thanks to all old try and error the new desgin make more sent and are more clean. still Createsruface does not working yet. 3. Fixed some comment tags for some whant start writing doc for thuse api you are wellcome

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jun 18 01:49:35 2007 New Revision: 27218 URL: http://svn.reactos.org/svn/reactos?rev=27218&view=rev Log: 1. fixed typo in DD->GetCaps 2. Started implement Createsurface for real this time. thanks to all old try and error the new desgin make more sent and are more clean. still Createsruface does not working yet. 3. Fixed some comment tags for some whant start writing doc for thuse api you are wellcome Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Mon Jun 18 01:49:35 2007 @@ -98,7 +98,7 @@ memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); } */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + memset(&myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { @@ -124,7 +124,7 @@ memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); } */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + memset(&myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { @@ -206,7 +206,7 @@ memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVHELCaps, sizeof(DDNONLOCALVIDMEMCAPS)); } */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + memset(&myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { @@ -232,7 +232,7 @@ memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVHELCaps, sizeof(DDNONLOCALVIDMEMCAPS)); } */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + memset(&myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 01:49:35 2007 @@ -12,6 +12,7 @@ /* PSEH for SEH Support */ #include <pseh/pseh.h> + /* * all param have been checked if they are vaild before they are call to * Internal_CreateSurface, if not please fix the code in the functions @@ -25,71 +26,123 @@ { DDSURFACEDESC2 desc; - /* Test se if the pointers are vaild */ - if ((IsBadReadPtr(pDDraw,sizeof(LPDDRAWI_DIRECTDRAW_INT))) || - (IsBadReadPtr(pDDSD,sizeof(LPDDSURFACEDESC2))) || - (IsBadWritePtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7))) || - (IsBadReadPtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7)))) - { - return DDERR_INVALIDPARAMS; - } - - /* make local backup of DDSURFACEDESC2 */ - RtlCopyMemory(&desc, pDDSD, sizeof(DDSURFACEDESC2)); - - /* - * pDDSD->dwCaps can not contain both DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY - * if both are define ddraw.dll will return error code 0x88760064 - */ - if ( (desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && - (desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) - { - return DDERR_INVALIDCAPS; - } - - /* check if pDDSD.dwFlags DDSD_LPSURFACE is set or not */ - if (desc.dwFlags & DDSD_LPSURFACE) - { - /* - * DDSD_LPSURFACE flag is set now we start vaildate see if - * pDDSD->lpSurface are a pointer or not - */ - if (IsBadReadPtr(desc.lpSurface,sizeof(LPVOID)) || - (desc.dwFlags - (desc.dwFlags & DDSD_ALL))) + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface = { 0 }; + DDHAL_CREATESURFACEDATA mDdCreateSurface = { 0 }; + + LPDDRAWI_DDRAWSURFACE_INT ThisSurfInt; + LPDDRAWI_DDRAWSURFACE_LCL ThisSurfLcl; + LPDDRAWI_DDRAWSURFACE_GBL ThisSurfaceGbl; + LPDDRAWI_DDRAWSURFACE_MORE ThisSurfaceMore; + + LPDDRAWI_DDRAWSURFACE_INT * slist_int; + LPDDRAWI_DDRAWSURFACE_LCL * slist_lcl; + LPDDRAWI_DDRAWSURFACE_GBL * slist_gbl; + LPDDRAWI_DDRAWSURFACE_MORE * slist_more; + DWORD num_of_surf=1; + DWORD count; + + + /* Fixme adding vaidlate of income param */ + + /* FIXME count our how many surface we need */ + + DxHeapMemAlloc(slist_int, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_INT ) ); + if( slist_int == NULL) + { + return DDERR_OUTOFMEMORY; + } + + DxHeapMemAlloc(slist_lcl, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_LCL ) ); + if( slist_lcl == NULL ) + { + DxHeapMemFree(slist_int); + return DDERR_OUTOFMEMORY; + } + + /* for more easy to free the memory if something goes wrong */ + DxHeapMemAlloc(slist_gbl, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_GBL ) ); + if( slist_lcl == NULL ) + { + DxHeapMemFree(slist_int); + return DDERR_OUTOFMEMORY; + } + + /* for more easy to free the memory if something goes wrong */ + DxHeapMemAlloc(slist_more, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_MORE ) ); + if( slist_lcl == NULL ) + { + DxHeapMemFree(slist_int); + return DDERR_OUTOFMEMORY; + } + + + + + for( count=0; count < num_of_surf; count++ ) + { + /* Alloc the surface interface and need members */ + DxHeapMemAlloc(ThisSurfInt, sizeof( DDRAWI_DDRAWSURFACE_INT ) ); + if( ThisSurfInt == NULL ) { - return DDERR_INVALIDPARAMS; + /* Fixme free the memory */ + return DDERR_OUTOFMEMORY; } - /* only support dx7 interface for DDSD_LPSURFACE older interface do not support it */ - if (pDDraw->lpVtbl != &DirectDraw7_Vtable) + DxHeapMemAlloc(ThisSurfLcl, sizeof( DDRAWI_DDRAWSURFACE_LCL ) ); + if( ThisSurfLcl == NULL ) { - return DDERR_INVALIDPARAMS; + /* Fixme free the memory */ + return DDERR_OUTOFMEMORY; } - /* vaildate the caps */ - if (desc.ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | - DDSCAPS_VIDEOPORT | DDSCAPS_PRIMARYSURFACE | DDSCAPS_OVERLAY )) + DxHeapMemAlloc(ThisSurfaceGbl, sizeof( DDRAWI_DDRAWSURFACE_GBL ) ); + if( ThisSurfaceGbl == NULL ) { - return DDERR_INVALIDCAPS; + /* Fixme free the memory */ + return DDERR_OUTOFMEMORY; } - /* more code will follow */ - } - else - { - /* - * DDSD_LPSURFACE flag are not set - * remove all wrong flags are being set - */ - - desc.dwFlags = desc.dwFlags & DDSD_ALL; - } - - /* more code will follow */ - - - - return DDERR_GENERIC; + DxHeapMemAlloc(ThisSurfaceMore, sizeof( DDRAWI_DDRAWSURFACE_MORE ) ); + if( ThisSurfaceMore == NULL ) + { + /* Fixme free the memory */ + return DDERR_OUTOFMEMORY; + } + + /* setup a list only one we really need is slist_lcl + rest of slist shall be release before a return */ + + slist_int[count] = ThisSurfInt; + slist_lcl[count] = ThisSurfLcl; + slist_gbl[count] = ThisSurfaceGbl; + slist_more[count] = ThisSurfaceMore; + + /* Start now fill in the member as they shall look like before call to createsurface */ + + ThisSurfInt->lpLcl = ThisSurfLcl; + ThisSurfLcl->lpGbl = ThisSurfaceGbl; + ThisSurfLcl->lpSurfMore = ThisSurfaceMore; + + /* FIXME set right version */ + ThisSurfInt->lpVtbl = &DirectDrawSurface7_Vtable; + + ThisSurfaceMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + ThisSurfaceMore->lpDD_int = pDDraw; + ThisSurfaceMore->lpDD_lcl = pDDraw->lpLcl; + ThisSurfaceMore->slist = slist_lcl; + + ThisSurfLcl->dwProcessId = GetCurrentProcessId(); + + /* FIXME the lpLnk */ + /* FIXME the ref counter */ + } + + + /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ + + + *ppSurf = &slist_int[0]->lpVtbl; + return DD_FALSE; } void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) @@ -101,34 +154,34 @@ HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, + LPDDRAWI_DDRAWSURFACE_INT That, + LPDDRAWI_DDRAWSURFACE_LCL lpLcl, LPDDSURFACEDESC2 pDDSD) { DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; DDHAL_CREATESURFACEDATA mDdCreateSurface; - DxHeapMemAlloc( That[0]->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That[0]->lpLcl->lpSurfMore == NULL) + DxHeapMemAlloc( That->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + if (That->lpLcl->lpSurfMore == NULL) { DxHeapMemFree(That); return DDERR_OUTOFMEMORY; } - That[0]->lpLcl->lpSurfMore->slist = lpLcl; - - That[0]->lpVtbl = &DirectDrawSurface7_Vtable; - That[0]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That[0]->lpLcl->lpSurfMore->lpDD_int = This; - That[0]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That[0]->lpLcl->lpSurfMore->slist[0] = That[0]->lpLcl; - That[0]->lpLcl->dwProcessId = GetCurrentProcessId(); + // That->lpLcl->lpSurfMore->slist = lpLcl; + + That->lpVtbl = &DirectDrawSurface7_Vtable; + That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + That->lpLcl->lpSurfMore->lpDD_int = This; + That->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; + That->lpLcl->lpSurfMore->slist[0] = That->lpLcl; + That->lpLcl->dwProcessId = GetCurrentProcessId(); mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; if (pDDSD->dwFlags & DDSD_PIXELFORMAT) { - That[0]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; + That->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; } else @@ -142,14 +195,14 @@ mDdCreateSurface.lpDD = This->lpLcl->lpGbl; mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That[0]->dwIntRefCnt + 1; // is this correct + mDdCreateSurface.dwSCnt = That->dwIntRefCnt + 1; // is this correct mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist; - - That[0]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That[0]; + mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; + + That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; + + This->lpLcl->lpPrimary = That; if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; @@ -160,7 +213,7 @@ return DDERR_NOTINITIALIZED; } - mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist; + mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { @@ -172,10 +225,10 @@ return mDdCreateSurface.ddRVal; } - That[0]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - That[0]->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That[0]; + That->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; + + That->lpLink = This->lpLcl->lpGbl->dsList; + This->lpLcl->lpGbl->dsList = That; return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Mon Jun 18 01:49:35 2007 @@ -71,5 +71,6 @@ // internal functions HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD); HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); -HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That,LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); +HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT That,LPDDRAWI_DDRAWSURFACE_LCL lpLcl, LPDDSURFACEDESC2 pDDSD); + Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Mon Jun 18 01:49:35 2007 @@ -18,6 +18,28 @@ CRITICAL_SECTION ddcs; // This function is exported by the dll + + + +/*++ +* @name DirectDrawCreateClipper +* +* The DirectDrawCreateClipper routine <FILLMEIN>. +* +* @param dwFlags +* <FILLMEIN>. +* +* @param lplpDDClipper +* <FILLMEIN>. +* +* @param pUnkOuter +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN pUnkOuter) { @@ -26,10 +48,26 @@ return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter); } -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ +/*++ +* @name DirectDrawCreate +* +* The DirectDrawCreate routine <FILLMEIN>. +* +* @param lpGUID +* <FILLMEIN>. +* +* @param lplpDD +* <FILLMEIN>. +* +* @param pUnkOuter +* Alwas set to NULL other wise will DirectDrawCreate fail it return +* errror code CLASS_E_NOAGGREGATION +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ HRESULT WINAPI @@ -64,11 +102,26 @@ return retVal; } -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ - +/*++ +* @name DirectDrawCreateEx +* +* The DirectDrawCreateEx routine <FILLMEIN>. +* +* @param lpGUID +* <FILLMEIN>. +* +* @param lplpDD +* <FILLMEIN>. +* +* @param pUnkOuter +* Alwas set to NULL other wise will DirectDrawCreateEx fail it return +* errror code CLASS_E_NOAGGREGATION +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ HRESULT WINAPI DirectDrawCreateEx(LPGUID lpGUID, @@ -187,6 +240,46 @@ sizeof(D3DHAL_DP2COMMAND) + ( D3DHAL_DP2COMMAND->wStateCount * sizeof(D3DHAL_DP2VIEWPORTINFO)); to get the xxxx end positions. */ + +/*++ +* @name D3DParseUnknownCommand +* +* The D3DParseUnknownCommand routine <FILLMEIN>. +* +* @param lpCmd +* Is a typcast to LPD3DHAL_DP2COMMAND struct +* typedef struct _D3DHAL_DP2COMMAND +* { +* BYTE bCommand; +* BYTE bReserved; +* union +* { +* WORD wPrimitiveCount; +* WORD wStateCount; +* }; +* } D3DHAL_DP2COMMAND, *LPD3DHAL_DP2COMMAND; +* +* lpCmd->bCommand +* only accpect D3DDP2OP_VIEWPORTINFO, and undocument command 0x0D +* rest of the command will be return error code for. +* + Command 0x0D +* dp2command->bReserved +* is how big struect we got in wStateCount or how many wStateCount we got +* do not known more about it, no info in msdn about it either. +* +* Command D3DDP2OP_VIEWPORTINFO +* <FILLMEIN>. +* +* @param lpRetCmd +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks + +* +*--*/ HRESULT WINAPI D3DParseUnknownCommand( LPVOID lpCmd, Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Mon Jun 18 01:49:35 2007 @@ -127,7 +127,7 @@ } else if (IsEqualGUID(&IID_IDirectDraw, id)) { - /* DirectDraw4 Vtable */ + /* DirectDraw Vtable */ This->lpVtbl = &DirectDraw_Vtable; *pIface = (LPDIRECTDRAW)&This->lpVtbl; Main_DirectDraw_AddRef((LPDIRECTDRAW7)This);

17 years, 6 months

← Newer
1
...
10
11
12
13
14
15
16
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007