Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 21513: [AUDIT] Confirmation from Eric Kohl that this is clean. depends.exe was used to get the names of the exported functions Also adding WordPad to the start menu with this commit
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: gedmurphy Date: Sat Apr 8 00:26:44 2006 New Revision: 21513 URL: http://svn.reactos.ru/svn/reactos?rev=21513&view=rev Log: [AUDIT] Confirmation from Eric Kohl that this is clean. depends.exe was used to get the names of the exported functions Also adding WordPad to the start menu with this commit Modified: trunk/reactos/dll/win32/syssetup/COPYING (props changed) trunk/reactos/dll/win32/syssetup/classinst.c (props changed) trunk/reactos/dll/win32/syssetup/dllmain.c (props changed) trunk/reactos/dll/win32/syssetup/globals.h (props changed) trunk/reactos/dll/win32/syssetup/install.c (contents, props changed) trunk/reactos/dll/win32/syssetup/logfile.c (props changed) trunk/reactos/dll/win32/syssetup/resource.h (contents, props changed) trunk/reactos/dll/win32/syssetup/resources/header.bmp (props changed) trunk/reactos/dll/win32/syssetup/resources/watermark.bmp (props changed) trunk/reactos/dll/win32/syssetup/syssetup.def (props changed) trunk/reactos/dll/win32/syssetup/syssetup.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Cz.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_De.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_En.rc (contents, props changed) trunk/reactos/dll/win32/syssetup/syssetup_Es.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Fr.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Hu.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Ja.rc (props changed) trunk/reactos/dll/win32/syssetup/syssetup_Nl.rc (props changed) trunk/reactos/dll/win32/syssetup/wizard.c (props changed) Propchange: trunk/reactos/dll/win32/syssetup/COPYING ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/classinst.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/globals.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/install.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Sat Apr 8 00:26:44 2006 @@ -427,6 +427,7 @@ CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("ReactOS Explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("WordPad.lnk"), _T("wordpad.exe"), IDS_CMT_WORDPAD); } Propchange: trunk/reactos/dll/win32/syssetup/install.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/logfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/resource… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Sat Apr 8 00:26:44 2006 @@ -54,7 +54,7 @@ #define IDD_PROCESSPAGE 1060 #define IDC_ACTIVITY 1061 -#define IDC_ITEM 1062 +#define IDC_ITEM 1062 #define IDC_PROCESSPROGRESS 1063 #define IDD_FINISHPAGE 1070 @@ -98,15 +98,16 @@ #define IDS_CMT_IBROWSER 3218 #define IDS_CMT_GETFIREFOX 3219 #define IDS_CMT_SERVMAN 3220 +#define IDS_CMT_WORDPAD 3221 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 #define IDS_REGISTERING_COMPONENTS 3302 -#define IDS_LOADLIBRARY_FAILED 3303 -#define IDS_GETPROCADDR_FAILED 3304 +#define IDS_LOADLIBRARY_FAILED 3303 +#define IDS_GETPROCADDR_FAILED 3304 #define IDS_REGSVR_FAILED 3305 -#define IDS_DLLINSTALL_FAILED 3306 -#define IDS_TIMEOUT 3307 +#define IDS_DLLINSTALL_FAILED 3306 +#define IDS_TIMEOUT 3307 #define IDS_REASON_UNKNOWN 3308 #define IDR_GPL 4000 Propchange: trunk/reactos/dll/win32/syssetup/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/resources/header.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/resources/watermark.bmp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Cz.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_De.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/win32/syssetup/syssetup_En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetup… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_En.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup_En.rc Sat Apr 8 00:26:44 2006 @@ -195,6 +195,7 @@ IDS_CMT_EXPLORER "Launch Explorer" IDS_CMT_NOTEPAD "Launch Text Editor" IDS_CMT_REGEDIT "Launch Registry Editor" + IDS_CMT_WORDPAD "Launch Document Editor" END STRINGTABLE Propchange: trunk/reactos/dll/win32/syssetup/syssetup_En.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Es.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Fr.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Hu.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Ja.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/syssetup_Nl.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/syssetup/wizard.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 21512: add wordpad to build
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: gedmurphy Date: Fri Apr 7 22:17:47 2006 New Revision: 21512 URL: http://svn.reactos.ru/svn/reactos?rev=21512&view=rev Log: add wordpad to build Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Apr 7 22:17:47 2006 @@ -31,6 +31,7 @@ ; Base files base\applications\cacls\cacls.exe 1 base\applications\calc\calc.exe 1 +base\applications\control\control.exe 1 base\applications\devmgr\devmgrapp.exe 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\winemine\winemine.exe 1 @@ -63,7 +64,7 @@ ;base\applications\utils\ps\ps.exe 1 base\applications\winefile\winefile.exe 1 ;base\applications\winver\winver.exe 1 -base\applications\control\control.exe 1 +base\applications\wordpad\wordpad.exe 1 base\services\dhcp\dhcp.exe 1 base\services\eventlog\eventlog.exe 1

1 0

[greatlrd] 21511: sorry did commit wrong version for Dx dhal blt here is it. can blt a surface (not tested).
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Fri Apr 7 22:08:45 2006 New Revision: 21511 URL: http://svn.reactos.ru/svn/reactos?rev=21511&view=rev Log: sorry did commit wrong version for Dx dhal blt here is it. can blt a surface (not tested). Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.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 Fri Apr 7 22:08:45 2006 @@ -232,7 +232,11 @@ DDHAL_BLTDATA mDdBlt; IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - //IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src; + IDirectDrawSurfaceImpl* That = NULL; + if (src!=NULL) + { + That = (IDirectDrawSurfaceImpl*)src; + } if (This==NULL) { @@ -268,10 +272,13 @@ { memcpy(& mDdBlt.rDest, rSrc, sizeof(DDBLTFX)); } - - - // FIXME setup src surface - mDdBlt.lpDDSrcSurface = NULL; //src-> + + if (src != NULL) + { + mDdBlt.lpDDSrcSurface = That->Surf->mpPrimaryLocals[0]; + } + + //mDdBlt.lpDDSrcSurface = NULL; //src-> mDdBlt.lpDD = &This->owner->mDDrawGlobal; mDdBlt.Blt = This->owner->mCallbacks.HALDDSurface.Blt;

1 0

[greatlrd] 21510: 1. Implement almost full dx hal DdBlt into ddraw we only need adding clipper or not set it to true or false. Then ddraw dx hal blt is complete 2. Split complete each surface getting own memory 3. Remove create for overlay for now the code need be more tested
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Fri Apr 7 22:03:21 2006 New Revision: 21510 URL: http://svn.reactos.ru/svn/reactos?rev=21510&view=rev Log: 1. Implement almost full dx hal DdBlt into ddraw we only need adding clipper or not set it to true or false. Then ddraw dx hal blt is complete 2. Split complete each surface getting own memory 3. Remove create for overlay for now the code need be more tested Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.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 Fri Apr 7 22:03:21 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; @@ -28,11 +28,12 @@ mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - memcpy(&This->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - This->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + { + + memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; + mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { @@ -44,31 +45,31 @@ return DDERR_NOTINITIALIZED; } - memset(&This->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; - - memset(&This->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - This->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&This->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - This->mPrimaryLocal.lpGbl = &This->mPrimaryGlobal; - This->mPrimaryLocal.lpSurfMore = &This->mPrimaryMore; - This->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + memset(&That->Surf->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + That->Surf->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + That->Surf->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + That->Surf->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + That->Surf->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + That->Surf->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + That->Surf->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; + + memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Surf->mPrimaryLocal.lpGbl = &That->Surf->mPrimaryGlobal; + That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; + That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); /* FIXME Check the flags if we shall create a primaresurface for overlay or something else Examine windows which flags are being set for we assume this is right unsue I think */ - //This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - This->mPrimaryLocal.ddsCaps.dwCaps = This->mddsdPrimary.ddsCaps.dwCaps; - That->Surf->mpPrimaryLocals[0] = &This->mPrimaryLocal; - - mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; + //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; + That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; + + mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; @@ -87,121 +88,122 @@ } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { - //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; + ////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; - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay; // pDDSD; - - - if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - 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; - - // setup front- and backbuffer surfaces - UINT cSurfaces = This->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) ? - (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]; - } - - for (i = 0; i < cSurfaces; i++) - { - UINT j = (i + 1) % cSurfaces; - if (!DdAttachSurface(This->mpOverlayLocals[i], This->mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); - return DD_FALSE; - } - } - - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay;//pDDSD; - mDdCreateSurface.lplpSList = This->mpOverlayLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; - mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; - mDdUpdateOverlay.lpDDSrcSurface = This->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; + //mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + //mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + //mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; + //mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay; // pDDSD; + + + //if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdCanCreateSurface.ddRVal != DD_OK) + //{ + // 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; + + //// setup front- and backbuffer surfaces + //UINT cSurfaces = This->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) ? + // (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]; + //} + + //for (i = 0; i < cSurfaces; i++) + //{ + // UINT j = (i + 1) % cSurfaces; + // if (!DdAttachSurface(This->mpOverlayLocals[i], This->mpOverlayLocals[j])) + // { + // // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); + // return DD_FALSE; + // } + //} + + //mDdCreateSurface.lpDD = &This->mDDrawGlobal; + //mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + //mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay;//pDDSD; + //mDdCreateSurface.lplpSList = This->mpOverlayLocals; //cSurfaces; + //mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; + + //if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdCreateSurface.ddRVal != DD_OK) + //{ + // return mDdCreateSurface.ddRVal; + //} + + //DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; + //mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; + //mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; + //mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; + //mDdUpdateOverlay.lpDDSrcSurface = This->mpOverlayLocals[0];//pDDSurface; + //mDdUpdateOverlay.dwFlags = DDOVER_SHOW; + + //mDdUpdateOverlay.rDest.top = 0; + //mDdUpdateOverlay.rDest.left = 0; + //mDdUpdateOverlay.rDest.right = 50; + //mDdUpdateOverlay.rDest.bottom = 50; + + //mDdUpdateOverlay.rSrc.top = 0; + //mDdUpdateOverlay.rSrc.left = 0; + //mDdUpdateOverlay.rSrc.right = 50; + //mDdUpdateOverlay.rSrc.bottom = 50; - if (mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdUpdateOverlay.ddRVal != DD_OK) - { - return mDdUpdateOverlay.ddRVal; - } - - return DD_OK; + //if (mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) + //{ + // return DDERR_NOTINITIALIZED; + //} + + //if (mDdUpdateOverlay.ddRVal != DD_OK) + //{ + // return mDdUpdateOverlay.ddRVal; + //} + + //return DD_OK; + return DDERR_INVALIDSURFACETYPE; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) @@ -277,7 +279,7 @@ mDdBlt.dwFlags = dwFlags; - This->Surf->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; + // This->Surf->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; // FIXME dectect if it clipped or not mDdBlt.IsClipped = FALSE; 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 Fri Apr 7 22:03:21 2006 @@ -46,21 +46,7 @@ UINT mcTextures; DDSURFACEDESC *mpTextures; - /* Surface */ - DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; - DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; - DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; - //DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; - DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; - DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; - //DDRAWI_DDRAWCLIPPER_INT mPrimaryClipperInterface; - DDSURFACEDESC mddsdPrimary; - DDSURFACEDESC mddsdOverlay; - - DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; - DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; - DDRAWI_DDRAWSURFACE_LCL *mpOverlayLocals[6]; - DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6]; + /* ExclusiveOwner */ @@ -77,8 +63,16 @@ /******** Surface Object ********/ typedef struct -{ +{ + DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; + DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; + DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; + + DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; + DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; + + DDSURFACEDESC mddsdPrimary; } DxSurf; typedef struct

1 0

[tretiakov] 21509: Update svn:ignore. config.xml -> config.rbuild
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 20:20:18 2006 New Revision: 21509 URL: http://svn.reactos.ru/svn/reactos?rev=21509&view=rev Log: Update svn:ignore. config.xml -> config.rbuild Modified: trunk/reactos/ (props changed) Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Apr 7 20:20:18 2006 @@ -23,7 +23,7 @@ *.patch *.diff makefile.auto -config.xml +config.rbuild obj-* output-* doxy-doc

1 0

[greatlrd] 21508: first part to change the arch of Surface time move surface into it own struct. so we can easy create a new one. no surface should be store global in ddraw.dll
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Fri Apr 7 20:16:34 2006 New Revision: 21508 URL: http://svn.reactos.ru/svn/reactos?rev=21508&view=rev Log: first part to change the arch of Surface time move surface into it own struct. so we can easy create a new one. no surface should be store global in ddraw.dll Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h 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 Fri Apr 7 20:16:34 2006 @@ -11,10 +11,11 @@ #include "rosdraw.h" -HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) +HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter) { UINT i; IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawSurfaceImpl* That = ppSurf; DDHAL_CREATESURFACEDATA mDdCreateSurface; DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; @@ -65,10 +66,10 @@ */ //This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; This->mPrimaryLocal.ddsCaps.dwCaps = This->mddsdPrimary.ddsCaps.dwCaps; - This->mpPrimaryLocals[0] = &This->mPrimaryLocal; + That->Surf->mpPrimaryLocals[0] = &This->mPrimaryLocal; mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; - mDdCreateSurface.lplpSList = This->mpPrimaryLocals; + mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) @@ -176,7 +177,7 @@ DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = This->mpPrimaryLocals[0]; + mDdUpdateOverlay.lpDDDestSurface = That->Surf->mpPrimaryLocals[0]; mDdUpdateOverlay.lpDDSrcSurface = This->mpOverlayLocals[0];//pDDSurface; mDdUpdateOverlay.dwFlags = DDOVER_SHOW; @@ -227,17 +228,23 @@ LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { DDHAL_BLTDATA mDdBlt; - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + //IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src; + if (This==NULL) + { + return DD_FALSE; + } + if (!(This->owner->mDDrawGlobal.lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT)) { return DDERR_NODRIVERSUPPORT; } - mDdBlt.lpDDDestSurface = This->owner->mpPrimaryLocals[0]; - - if (!DdResetVisrgn(This->owner->mpPrimaryLocals[0], NULL)) + mDdBlt.lpDDDestSurface = This->Surf->mpPrimaryLocals[0]; + + if (!DdResetVisrgn(This->Surf->mpPrimaryLocals[0], NULL)) { return DDERR_NOGDI; } @@ -266,11 +273,11 @@ mDdBlt.lpDD = &This->owner->mDDrawGlobal; mDdBlt.Blt = This->owner->mCallbacks.HALDDSurface.Blt; - mDdBlt.lpDDDestSurface = This->owner->mpPrimaryLocals[0]; + mDdBlt.lpDDDestSurface = This->Surf->mpPrimaryLocals[0]; mDdBlt.dwFlags = dwFlags; - This->owner->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; + This->Surf->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; // FIXME dectect if it clipped or not mDdBlt.IsClipped = FALSE; 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 Fri Apr 7 20:16:34 2006 @@ -232,6 +232,7 @@ LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { HRESULT ret; + DxSurf *surf; if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; @@ -252,10 +253,21 @@ } ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); + surf = (DxSurf*)HeapAlloc(GetProcessHeap(), 0, sizeof(DxSurf)); + + if (surf == NULL) + { + // FIXME Free memmory at exit + return E_OUTOFMEMORY; + } + + + That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; *ppSurf = (LPDIRECTDRAWSURFACE7)That; + // FIXME free This->mDDrawGlobal.dsList on release This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDRAWI_DDRAWSURFACE_INT)); That->owner = (IDirectDrawImpl *)This; @@ -264,19 +276,19 @@ /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ That->owner->mDDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; - - + + That->Surf = surf; if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) { - ret = Hal_DirectDraw_CreateSurface (iface, pDDSD, ppSurf, pUnkOuter); + ret = Hal_DirectDraw_CreateSurface (iface, pDDSD, That, pUnkOuter); } else { ret = Hel_DirectDraw_CreateSurface (iface, pDDSD, ppSurf, pUnkOuter); } - This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)&This->mPrimaryLocal; + //This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)&This->mPrimaryLocal; // the real surface object creation 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 Fri Apr 7 20:16:34 2006 @@ -50,7 +50,7 @@ DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; - DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; + //DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; //DDRAWI_DDRAWCLIPPER_INT mPrimaryClipperInterface; @@ -76,6 +76,10 @@ } IDirectDrawImpl; /******** Surface Object ********/ +typedef struct +{ + DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; +} DxSurf; typedef struct { @@ -90,7 +94,13 @@ DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; DDSURFACEDESC ddsd; + DxSurf *Surf; + } IDirectDrawSurfaceImpl; + + + + /******** Clipper Object ********/ @@ -142,7 +152,7 @@ HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); -HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); +HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter); HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 );

1 0

[tretiakov] 21507: [AUDIT] \trunk\reactos\drivers\bus\serenum (Unlocked) Herve Poussineau (the author) said parts he wrote are clean. There were no actual code from other contributors (only warning fixes etc.)
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 19:34:51 2006 New Revision: 21507 URL: http://svn.reactos.ru/svn/reactos?rev=21507&view=rev Log: [AUDIT] \trunk\reactos\drivers\bus\serenum (Unlocked) Herve Poussineau (the author) said parts he wrote are clean. There were no actual code from other contributors (only warning fixes etc.) Modified: trunk/reactos/drivers/bus/serenum/detect.c (props changed) trunk/reactos/drivers/bus/serenum/fdo.c (props changed) trunk/reactos/drivers/bus/serenum/misc.c (props changed) trunk/reactos/drivers/bus/serenum/pdo.c (props changed) trunk/reactos/drivers/bus/serenum/serenum.c (props changed) trunk/reactos/drivers/bus/serenum/serenum.h (props changed) trunk/reactos/drivers/bus/serenum/serenum.rc (props changed) Propchange: trunk/reactos/drivers/bus/serenum/detect.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/fdo.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/misc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/pdo.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/serenum.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/serenum.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/serenum/serenum.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 21506: control.exe is not a control panel applet. Moved to applications.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 19:07:50 2006 New Revision: 21506 URL: http://svn.reactos.ru/svn/reactos?rev=21506&view=rev Log: control.exe is not a control panel applet. Moved to applications. Added: trunk/reactos/base/applications/control/ - copied from r21485, trunk/reactos/dll/cpl/control/ Removed: trunk/reactos/dll/cpl/control/ Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/applicati… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Fri Apr 7 19:07:50 2006 @@ -58,4 +58,7 @@ <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" /> </directory> +<directory name="control"> + <xi:include href="control/control.rbuild" /> +</directory> </group> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Apr 7 19:07:50 2006 @@ -63,6 +63,7 @@ ;base\applications\utils\ps\ps.exe 1 base\applications\winefile\winefile.exe 1 ;base\applications\winver\winver.exe 1 +base\applications\control\control.exe 1 base\services\dhcp\dhcp.exe 1 base\services\eventlog\eventlog.exe 1 @@ -98,7 +99,6 @@ dll\cpl\access\access.cpl 1 dll\cpl\appwiz\appwiz.cpl 1 -dll\cpl\control\control.exe 1 dll\cpl\desk\desk.cpl 1 dll\cpl\intl\intl.cpl 1 dll\cpl\main\main.cpl 1 Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=2150… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Fri Apr 7 19:07:50 2006 @@ -3,9 +3,6 @@ </directory> <directory name="appwiz"> <xi:include href="appwiz/appwiz.rbuild" /> -</directory> -<directory name="control"> - <xi:include href="control/control.rbuild" /> </directory> <directory name="desk"> <xi:include href="desk/desk.rbuild" />

1 0

[tretiakov] 21505: Thomas Weidenmueller is not author of this control panel applet. From svn log I found that former author was Johannes Anderwald (j_anderw@sbox.tugraz.at). Updated headers.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 17:03:59 2006 New Revision: 21505 URL: http://svn.reactos.ru/svn/reactos?rev=21505&view=rev Log: Thomas Weidenmueller is not author of this control panel applet. From svn log I found that former author was Johannes Anderwald (j_anderw(a)sbox.tugraz.at). Updated headers. Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/access.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/sysdm.c * PURPOSE: ReactOS System Control Panel - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/display.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */ Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Fri Apr 7 17:03:59 2006 @@ -1,27 +1,10 @@ -/* - * ReactOS - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/system/advanced.c * PURPOSE: Memory, start-up and profiles settings - * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) * UPDATE HISTORY: * 03-04-2004 Created */

1 0

[tretiakov] 21504: [AUDIT] \trunk\reactos\dll\cpl\access (unlocked) This code seems clean, it does nothing useful. Thomas Weidenmueller agreed it's clean too.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 16:24:00 2006 New Revision: 21504 URL: http://svn.reactos.ru/svn/reactos?rev=21504&view=rev Log: [AUDIT] \trunk\reactos\dll\cpl\access (unlocked) This code seems clean, it does nothing useful. Thomas Weidenmueller agreed it's clean too. Modified: trunk/reactos/dll/cpl/access/access.c (props changed) trunk/reactos/dll/cpl/access/access.h (props changed) trunk/reactos/dll/cpl/access/display.c (props changed) trunk/reactos/dll/cpl/access/general.c (props changed) trunk/reactos/dll/cpl/access/keyboard.c (props changed) trunk/reactos/dll/cpl/access/mouse.c (props changed) trunk/reactos/dll/cpl/access/resource.h (props changed) trunk/reactos/dll/cpl/access/resources/applet.ico (props changed) trunk/reactos/dll/cpl/access/sound.c (props changed) Propchange: trunk/reactos/dll/cpl/access/access.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/access.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/display.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/general.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/keyboard.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/mouse.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/resources/applet.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/access/sound.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

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