Ros-diffs April 2006

ros-diffs@reactos.org

14 participants
324 discussions

[greatlrd] 21536: fixing a typcast do it compile on gcc 4.0 thx w3seek
by greatlrd＠svn.reactos.org 09 Apr '06

09 Apr '06

Author: greatlrd Date: Sun Apr 9 22:28:53 2006 New Revision: 21536 URL: http://svn.reactos.ru/svn/reactos?rev=21536&view=rev Log: fixing a typcast do it compile on gcc 4.0 thx w3seek Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c 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 Sun Apr 9 22:28:53 2006 @@ -121,7 +121,7 @@ if (iface!=NULL) { - ref = InterlockedIncrement(&This->ref); + ref = InterlockedIncrement( (PLONG) &This->ref); } return ref; } @@ -143,7 +143,7 @@ if (iface!=NULL) { - ref = InterlockedDecrement(&This->ref); + ref = InterlockedDecrement( (PLONG) &This->ref); if (ref == 0) {

1 0

[greatlrd] 21535: Fixing a bug fill in a struct it return zero info but we need that info later
by greatlrd＠svn.reactos.org 09 Apr '06

09 Apr '06

Author: greatlrd Date: Sun Apr 9 22:08:18 2006 New Revision: 21535 URL: http://svn.reactos.ru/svn/reactos?rev=21535&view=rev Log: Fixing a bug fill in a struct it return zero info but we need that info later Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.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 Sun Apr 9 22:08:18 2006 @@ -94,7 +94,55 @@ 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; @@ -346,6 +394,8 @@ Lock.lpDD = &This->owner->mDDrawGlobal; Lock.lpSurfData = NULL; + // FIXME some how lock goes wrong; + return DD_FALSE; if (This->owner->mCallbacks.HALDDSurface.Lock(&Lock)!= DDHAL_DRIVER_HANDLED) { return Lock.ddRVal; 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 Sun Apr 9 22:08:18 2006 @@ -473,6 +473,7 @@ { return DD_FALSE; } + pDDSD->dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE | DDSD_WIDTH; pDDSD->dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight;

1 0

[peterw] 21534: Changed DbgPrint to DPRINT.
by peterw＠svn.reactos.org 09 Apr '06

09 Apr '06

Author: peterw Date: Sun Apr 9 21:58:43 2006 New Revision: 21534 URL: http://svn.reactos.ru/svn/reactos?rev=21534&view=rev Log: Changed DbgPrint to DPRINT. Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/disk/disk.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/storage/disk/disk.c… ============================================================================== --- trunk/reactos/drivers/storage/disk/disk.c (original) +++ trunk/reactos/drivers/storage/disk/disk.c Sun Apr 9 21:58:43 2006 @@ -500,7 +500,7 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DbgPrint("Could not create device dir object\n"); + DPRINT("Could not create device dir object\n"); return(Status); } @@ -511,7 +511,7 @@ &PortDeviceObject); if (!NT_SUCCESS(Status)) { - DbgPrint("Could not claim disk device\n"); + DPRINT("Could not claim disk device\n"); ZwMakeTemporaryObject(Handle); ZwClose(Handle);

1 0

[greatlrd] 21533: Implement GetSurfaceDesc
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: greatlrd Date: Sun Apr 9 21:05:57 2006 New Revision: 21533 URL: http://svn.reactos.ru/svn/reactos?rev=21533&view=rev Log: Implement GetSurfaceDesc Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h 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 Sun Apr 9 21:05:57 2006 @@ -13,7 +13,7 @@ HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter) { - //UINT i; + // UINT i; IDirectDrawImpl* This = (IDirectDrawImpl*)iface; IDirectDrawSurfaceImpl* That = ppSurf; @@ -101,26 +101,26 @@ } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { - DX_STUB_str( "Can not create overlay surface"); - ////memset(&This->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); - //memcpy(&This->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); - //This->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - ////This->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - - ////This->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - ////This->mddsdOverlay.dwWidth = 100; //pels; - ////This->mddsdOverlay.dwHeight = 100; // lines; - ////This->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - ////This->mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - ////This->mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; - ////This->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; + // 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 = &This->mddsdOverlay; // pDDSD; + //mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay; // pDDSD; //if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) @@ -133,40 +133,40 @@ // return DDERR_NOTINITIALIZED; //} - //memset(&This->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - //This->mOverlayGlobal.dwGlobalFlags = 0; - //This->mOverlayGlobal.lpDD = &This->mDDrawGlobal; - //This->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; - //This->mOverlayGlobal.wWidth = (WORD)This->mddsdOverlay.dwWidth; - //This->mOverlayGlobal.wHeight = (WORD)This->mddsdOverlay.dwHeight; - //This->mOverlayGlobal.lPitch = -1; - //This->mOverlayGlobal.ddpfSurface = This->mddsdOverlay.ddpfPixelFormat; + //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 = This->mddsdOverlay.dwBackBufferCount + 1; + //UINT cSurfaces = That->Surf->mddsdOverlay.dwBackBufferCount + 1; //for (i = 0; i < cSurfaces; i++) //{ - // memset(&This->mOverlayMore[i], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - // This->mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - // memset(&This->mOverlayLocal[i], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - // This->mOverlayLocal[i].lpGbl = &This->mOverlayGlobal; - // This->mOverlayLocal[i].lpSurfMore = &This->mOverlayMore[i]; - // This->mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); - // This->mOverlayLocal[i].dwFlags = (i == 0) ? + // 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); - // This->mOverlayLocal[i].dwFlags |= DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| DDRAWISURF_HASPIXELFORMAT| DDRAWISURF_HASOVERLAYDATA; - - // This->mOverlayLocal[i].ddsCaps.dwCaps = This->mddsdOverlay.ddsCaps.dwCaps; - // This->mpOverlayLocals[i] = &This->mOverlayLocal[i]; + // 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(This->mpOverlayLocals[i], This->mpOverlayLocals[j])) + // 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; @@ -175,8 +175,8 @@ //mDdCreateSurface.lpDD = &This->mDDrawGlobal; //mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - //mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay;//pDDSD; - //mDdCreateSurface.lplpSList = This->mpOverlayLocals; //cSurfaces; + //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) @@ -193,7 +193,7 @@ //mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; //mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; //mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; - //mDdUpdateOverlay.lpDDSrcSurface = This->mpOverlayLocals[0];//pDDSurface; + //mDdUpdateOverlay.lpDDSrcSurface = That->Surf->mpOverlayLocals[0];//pDDSurface; //mDdUpdateOverlay.dwFlags = DDOVER_SHOW; //mDdUpdateOverlay.rDest.top = 0; @@ -216,7 +216,7 @@ // return mDdUpdateOverlay.ddRVal; //} - //return DD_OK; + return DD_OK; return DDERR_INVALIDSURFACETYPE; } 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 Sun Apr 9 21:05:57 2006 @@ -144,9 +144,7 @@ if (iface!=NULL) { ref = InterlockedDecrement(&This->ref); - - DX_WINDBG_trace_res((INT)This->mDDrawGlobal.dwRefCnt,(INT)ref,(INT)0); - + if (ref == 0) { // set resoltion back to the one in registry @@ -481,22 +479,19 @@ pDDSD->dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; pDDSD->lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; pDDSD->dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - + pDDSD->dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); RtlCopyMemory(&pDDSD->ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + + RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); + RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); /* have not check where I should get hold of this info yet - DWORD dwBackBufferCount; - DWORD dwAlphaBitDepth; + DWORD dwBackBufferCount; DWORD dwReserved; - LPVOID lpSurface; - union - { - DDCOLORKEY ddckCKDestOverlay; - DWORD dwEmptyFaceColor; - } - DDCOLORKEY ddckCKDestBlt; - DDCOLORKEY ddckCKSrcOverlay; + LPVOID lpSurface; + DDCOLORKEY ddckCKDestBlt; DDCOLORKEY ddckCKSrcBlt; DWORD dwTextureStage; */ Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sun Apr 9 21:05:57 2006 @@ -406,9 +406,24 @@ Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD) { - DX_WINDBG_trace(); - - DX_STUB; + DWORD dwSize; + DX_WINDBG_trace(); + + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; + + dwSize = pDDSD->dwSize; + + if ((dwSize != sizeof(DDSURFACEDESC)) && + (dwSize != sizeof(DDSURFACEDESC2))) + { + return DDERR_GENERIC; + } + + RtlZeroMemory(pDDSD,dwSize); + memcpy(pDDSD, &This->Surf->mddsdPrimary, sizeof(DDSURFACEDESC)); + pDDSD->dwSize = dwSize; + + return DD_OK; } HRESULT WINAPI 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 Sun Apr 9 21:05:57 2006 @@ -92,6 +92,14 @@ DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; DDSURFACEDESC mddsdPrimary; + + DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; + DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; + DDRAWI_DDRAWSURFACE_LCL *mpOverlayLocals[6]; + DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6]; + + DDSURFACEDESC mddsdOverlay; + } DxSurf; typedef struct @@ -229,7 +237,7 @@ char buffer[1024]; \ sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ OutputDebugStringA(buffer); \ - firstcallx = FALSE; \ + firstcallx = TRUE; \ } #define DX_WINDBG_trace_res(width,height,bpp) \

1 0

[greatlrd] 21532: Thanks billycash to explain for me how ref counter works in ddraw. Now we free the COM when it need it (no more memory leak)
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: greatlrd Date: Sun Apr 9 19:07:43 2006 New Revision: 21532 URL: http://svn.reactos.ru/svn/reactos?rev=21532&view=rev Log: Thanks billycash to explain for me how ref counter works in ddraw. Now we free the COM when it need it (no more memory leak) 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 Sun Apr 9 19:07:43 2006 @@ -118,11 +118,11 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; ULONG ref=0; - + if (iface!=NULL) { - ref = InterlockedIncrement((PLONG)&This->mDDrawGlobal.dwRefCnt); - } + ref = InterlockedIncrement(&This->ref); + } return ref; } @@ -143,8 +143,10 @@ if (iface!=NULL) { - ref = InterlockedDecrement((PLONG)&This->mDDrawGlobal.dwRefCnt); - + ref = InterlockedDecrement(&This->ref); + + DX_WINDBG_trace_res((INT)This->mDDrawGlobal.dwRefCnt,(INT)ref,(INT)0); + if (ref == 0) { // set resoltion back to the one in registry @@ -153,17 +155,11 @@ ChangeDisplaySettings(NULL, 0); } - Hal_DirectDraw_Release(iface); - //Hel_DirectDraw_Release(iface); - - RtlZeroMemory(&This->mDDrawGlobal, sizeof(DDRAWI_DIRECTDRAW_GBL)); - //RtlZeroMemory(This, sizeof(IDirectDrawImpl)); - + //Hel_DirectDraw_Release(iface); if (This!=NULL) - { - - // HeapFree(GetProcessHeap(), 0, This); + { + HeapFree(GetProcessHeap(), 0, This); } } } 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 Sun Apr 9 19:07:43 2006 @@ -74,6 +74,9 @@ /* HEL stuff */ DWORD HELMemoryAvilable; + + /* internal counter */ + ULONG ref; } IDirectDrawImpl;

1 0

[cwittich] 21531: display all timezones (buffer was too small)
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: cwittich Date: Sun Apr 9 18:55:58 2006 New Revision: 21531 URL: http://svn.reactos.ru/svn/reactos?rev=21531&view=rev Log: display all timezones (buffer was too small) Modified: trunk/reactos/dll/cpl/timedate/timedate.c (contents, props changed) Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Sun Apr 9 18:55:58 2006 @@ -24,8 +24,8 @@ struct _TIMEZONE_ENTRY *Prev; struct _TIMEZONE_ENTRY *Next; WCHAR Description[64]; /* 'Display' */ - WCHAR StandardName[32]; /* 'Std' */ - WCHAR DaylightName[32]; /* 'Dlt' */ + WCHAR StandardName[33]; /* 'Std' */ + WCHAR DaylightName[33]; /* 'Dlt' */ TZ_INFO TimezoneInfo; /* 'TZI' */ ULONG Index; /* 'Index ' */ } TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; @@ -474,7 +474,7 @@ break; } - dwValueSize = 32 * sizeof(WCHAR); + dwValueSize = 33 * sizeof(WCHAR); if (RegQueryValueExW(hZoneKey, L"Std", NULL, @@ -486,7 +486,7 @@ break; } - dwValueSize = 32 * sizeof(WCHAR); + dwValueSize = 33 * sizeof(WCHAR); if (RegQueryValueExW(hZoneKey, L"Dlt", NULL, Propchange: trunk/reactos/dll/cpl/timedate/timedate.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[cwittich] 21530: fix setup in VGA mode
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: cwittich Date: Sun Apr 9 18:15:21 2006 New Revision: 21530 URL: http://svn.reactos.ru/svn/reactos?rev=21530&view=rev Log: fix setup in VGA mode Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sun Apr 9 18:15:21 2006 @@ -771,6 +771,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 + ; Windows Installer Service HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Adds, modifies, and removes applications provided as a Windows Installer (*.msi) package. If this service is disabled, any services that explicitly depend on it will fail to start." HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"Windows Installer"

1 0

[greatlrd] 21529: Fixing a crash bug But ddraw can leak memmory now. But it is werid that u can not total release the whole dx COM for some program will crash then
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: greatlrd Date: Sun Apr 9 18:12:42 2006 New Revision: 21529 URL: http://svn.reactos.ru/svn/reactos?rev=21529&view=rev Log: Fixing a crash bug But ddraw can leak memmory now. But it is werid that u can not total release the whole dx COM for some program will crash then Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c 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 Sun Apr 9 18:12:42 2006 @@ -152,13 +152,19 @@ { ChangeDisplaySettings(NULL, 0); } + Hal_DirectDraw_Release(iface); //Hel_DirectDraw_Release(iface); + RtlZeroMemory(&This->mDDrawGlobal, sizeof(DDRAWI_DIRECTDRAW_GBL)); - RtlZeroMemory(This, sizeof(IDirectDrawImpl)); - - HeapFree(GetProcessHeap(), 0, This); + //RtlZeroMemory(This, sizeof(IDirectDrawImpl)); + + if (This!=NULL) + { + + // HeapFree(GetProcessHeap(), 0, This); + } } } return ref;

1 0

[cwittich] 21528: change display modes from 640x680 to 640x480
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: cwittich Date: Sun Apr 9 16:49:52 2006 New Revision: 21528 URL: http://svn.reactos.ru/svn/reactos?rev=21528&view=rev Log: change display modes from 640x680 to 640x480 Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif?… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sun Apr 9 16:49:52 2006 @@ -67,9 +67,9 @@ [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<hight>,<width>,<bpp> -vga = "VGA Display (640x680x8)",,Vga,640,480,8 -vbe_640x480x8 = "VESA Display (640x680x8)",,VBE,640,480,8 -vbe_640x480x16 = "VESA Display (640x680x16)",,VBE,640,480,16 +vga = "VGA Display (640x480x8)",,Vga,640,480,8 +vbe_640x480x8 = "VESA Display (640x480x8)",,VBE,640,480,8 +vbe_640x480x16 = "VESA Display (640x480x16)",,VBE,640,480,16 vbe_800x600x8 = "VESA Display (800x600x8)",,VBE,800,600,8 vbe = "VESA Display (800x600x16)",,VBE,800,600,16 vbe_1024x768x8 = "VESA Display (1024x768x8)",,VBE,1024,768,8

1 0

[cwittich] 21527: added proper headers
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: cwittich Date: Sun Apr 9 16:15:43 2006 New Revision: 21527 URL: http://svn.reactos.ru/svn/reactos?rev=21527&view=rev Log: added proper headers Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c trunk/reactos/base/applications/msconfig/generalpage.c trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/msconfig/srvpage.c trunk/reactos/base/applications/msconfig/startuppage.c trunk/reactos/base/applications/msconfig/systempage.c trunk/reactos/base/applications/msconfig/toolspage.c Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/msconfig/… ============================================================================== --- trunk/reactos/base/applications/msconfig/freeldrpage.c (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.c Sun Apr 9 16:15:43 2006 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/freeldrpage.c + * PURPOSE: Freeloader configuration page message handler + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * + */ + #include <precomp.h> HWND hFreeLdrPage; Modified: trunk/reactos/base/applications/msconfig/generalpage.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/msconfig/… ============================================================================== --- trunk/reactos/base/applications/msconfig/generalpage.c (original) +++ trunk/reactos/base/applications/msconfig/generalpage.c Sun Apr 9 16:15:43 2006 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/generalpage.c + * PURPOSE: General page message handler + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * + */ + #include <precomp.h> HWND hGeneralPage; Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/msconfig/… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Sun Apr 9 16:15:43 2006 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/msconfig.c + * PURPOSE: msconfig main dialog + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * + */ #include <precomp.h> HINSTANCE hInst = 0; Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/msconfig/… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c Sun Apr 9 16:15:43 2006 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/srvpage.c + * PURPOSE: Services page message handler + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * + */ + #include <precomp.h> HWND hServicesPage; Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/msconfig/… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c Sun Apr 9 16:15:43 2006 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/startuppage.c + * PURPOSE: Startup page message handler + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * + */ + #include <precomp.h> HWND hStartupPage; Modified: trunk/reactos/base/applications/msconfig/systempage.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/msconfig/… ============================================================================== --- trunk/reactos/base/applications/msconfig/systempage.c (original) +++ trunk/reactos/base/applications/msconfig/systempage.c Sun Apr 9 16:15:43 2006 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/systempage.c + * PURPOSE: System page message handler + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * + */ #include <precomp.h> HWND hSystemPage; Modified: trunk/reactos/base/applications/msconfig/toolspage.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/msconfig/… ============================================================================== --- trunk/reactos/base/applications/msconfig/toolspage.c (original) +++ trunk/reactos/base/applications/msconfig/toolspage.c Sun Apr 9 16:15:43 2006 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/toolspage.c + * PURPOSE: Tools page message handler + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * + */ + #include <precomp.h> HWND hToolsPage;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
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