Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[hbirr] 18729: Delete some files which weren't deleted by the merge.

by hbirr＠svn.reactos.com

Delete some files which weren't deleted by the merge. Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/tcpsvcs/ Deleted: branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/makefile Deleted: branches/cache_manager_rewrite/reactos/include/ddrawi.h Deleted: branches/cache_manager_rewrite/reactos/include/ndk/zwtypes.h Deleted: branches/cache_manager_rewrite/reactos/include/ntdll/ Deleted: branches/cache_manager_rewrite/reactos/lib/aclui/acluilib.h Deleted: branches/cache_manager_rewrite/reactos/lib/comctl32/winetest/ Deleted: branches/cache_manager_rewrite/reactos/lib/fslib/vfatxlib/Makefile Deleted: branches/cache_manager_rewrite/reactos/lib/midimap/ Deleted: branches/cache_manager_rewrite/reactos/lib/msgina/makefile Deleted: branches/cache_manager_rewrite/reactos/lib/ntdll/csr/lpc.c Deleted: branches/cache_manager_rewrite/reactos/lib/ntdll/csr/srv.c Deleted: branches/cache_manager_rewrite/reactos/lib/ntdll/rtl/critical.c Deleted: branches/cache_manager_rewrite/reactos/lib/ntdll/rtl/path.c Deleted: branches/cache_manager_rewrite/reactos/lib/objsel/Makefile.in Deleted: branches/cache_manager_rewrite/reactos/lib/setupapi/makefile Deleted: branches/cache_manager_rewrite/reactos/lib/smdll/connect.c Deleted: branches/cache_manager_rewrite/reactos/lib/smlib/makefile Deleted: branches/cache_manager_rewrite/reactos/lib/winmm/Makefile.in Deleted: branches/cache_manager_rewrite/reactos/ntoskrnl/ps/w32call.c Deleted: branches/cache_manager_rewrite/reactos/subsys/system/dhcp/ Deleted: branches/cache_manager_rewrite/reactos/subsys/system/expand/makefile Deleted: branches/cache_manager_rewrite/reactos/subsys/system/usetup/precomp.h Deleted: branches/cache_manager_rewrite/reactos/subsys/win32k/misc/object.c _____ Deleted: branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/makefile --- branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/makefile 2005-10-23 21:31:15 UTC (rev 18728) +++ branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/makefile 2005-10-23 23:40:19 UTC (rev 18729) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ..\..\.. -DEFAULT = i8042prt -include $(TOP)/proxy.mak _____ Deleted: branches/cache_manager_rewrite/reactos/include/ddrawi.h --- branches/cache_manager_rewrite/reactos/include/ddrawi.h 2005-10-23 21:31:15 UTC (rev 18728) +++ branches/cache_manager_rewrite/reactos/include/ddrawi.h 2005-10-23 23:40:19 UTC (rev 18729) @@ -1,1331 +0,0 @@ -/* - * DirectDraw driver interface - * (DirectX 7 version) - * - * Copyright (C) 2001 Ove Kaaven - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __DDRAWI_INCLUDED__ -#define __DDRAWI_INCLUDED__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <ddraw.h> - -#ifndef __DDK_DDRAWINT_H -typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; /* should be in dvp.h */ -typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */ -typedef struct _VMEMHEAP *LPVMEMHEAP; /* should be in dmemmgr.h */ -#endif - -#define DDAPI WINAPI - -/* the DirectDraw versions */ -#define DD_VERSION 0x0200 /* compatibility version */ -#define DD_RUNTIME_VERSION 0x0700 /* actual version */ - -/* the HAL version returned from QUERYESCSUPPORT - DCICOMMAND */ -#define DD_HAL_VERSION 0x0100 - -/* more DCICOMMAND escapes */ -#define DDCREATEDRIVEROBJECT 10 -#define DDGET32BITDRIVERNAME 11 -#define DDNEWCALLBACKFNS 12 -#define DDVERSIONINFO 13 - -#define MAX_DRIVER_NAME CCHDEVICENAME - -/********************************************************************** ******* - * Initialization stuff - */ -typedef struct { - char szName[260]; - char szEntryPoint[64]; - DWORD dwContext; -} DD32BITDRIVERDATA,*LPDD32BITDRIVERDATA; - -typedef struct { - DWORD dwHALVersion; - ULONG_PTR dwReserved1; - ULONG_PTR dwReserved2; -} DDVERSIONDATA,*LPDDVERSIONDATA; - -typedef DWORD (PASCAL *LPDD32BITDRIVERINIT)(DWORD dwContext); - -#ifndef __DDK_DDRAWINT_H -/* pointer to video memory */ -typedef ULONG_PTR FLATPTR; -#endif - -/* predeclare some structures */ -typedef struct _DDHALINFO *LPDDHALINFO; -typedef struct _DDRAWI_DIRECTDRAW_INT *LPDDRAWI_DIRECTDRAW_INT; -typedef struct _DDRAWI_DIRECTDRAW_LCL *LPDDRAWI_DIRECTDRAW_LCL; -typedef struct _DDRAWI_DIRECTDRAW_GBL *LPDDRAWI_DIRECTDRAW_GBL; -typedef struct _DDRAWI_DDRAWSURFACE_INT *LPDDRAWI_DDRAWSURFACE_INT; -typedef struct _DDRAWI_DDRAWSURFACE_LCL *LPDDRAWI_DDRAWSURFACE_LCL; -typedef struct _DDRAWI_DDRAWSURFACE_GBL *LPDDRAWI_DDRAWSURFACE_GBL; -typedef struct _DDRAWI_DDRAWSURFACE_MORE *LPDDRAWI_DDRAWSURFACE_MORE; -typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE *LPDDRAWI_DDRAWSURFACE_GBL_MORE; -typedef struct _DDRAWI_DDRAWPALETTE_INT *LPDDRAWI_DDRAWPALETTE_INT; -typedef struct _DDRAWI_DDRAWPALETTE_LCL *LPDDRAWI_DDRAWPALETTE_LCL; -typedef struct _DDRAWI_DDRAWPALETTE_GBL *LPDDRAWI_DDRAWPALETTE_GBL; -typedef struct _DDRAWI_DDRAWCLIPPER_INT *LPDDRAWI_DDRAWCLIPPER_INT; -typedef struct _DDRAWI_DDRAWCLIPPER_LCL *LPDDRAWI_DDRAWCLIPPER_LCL; -typedef struct _DDRAWI_DDRAWCLIPPER_GBL *LPDDRAWI_DDRAWCLIPPER_GBL; -typedef struct _DDRAWI_DDVIDEOPORT_INT *LPDDRAWI_DDVIDEOPORT_INT; -typedef struct _DDRAWI_DDVIDEOPORT_LCL *LPDDRAWI_DDVIDEOPORT_LCL; -typedef struct _DDRAWI_DDMOTIONCOMP_INT *LPDDRAWI_DDMOTIONCOMP_INT; -typedef struct _DDRAWI_DDMOTIONCOMP_LCL *LPDDRAWI_DDMOTIONCOMP_LCL; - -/********************************************************************** ******* - * driver->ddraw callbacks - */ -typedef BOOL (DDAPI *LPDDHAL_SETINFO)(LPDDHALINFO lpDDHalInfo, BOOL reset); -typedef FLATPTR (DDAPI *LPDDHAL_VIDMEMALLOC)(LPDDRAWI_DIRECTDRAW_GBL lpDD, int heap, DWORD dwWidth, DWORD dwHeight); -typedef void (DDAPI *LPDDHAL_VIDMEMFREE)(LPDDRAWI_DIRECTDRAW_GBL lpDD, int heap, FLATPTR fpMem); - -typedef struct { - DWORD dwSize; - LPDDHAL_SETINFO lpSetInfo; - LPDDHAL_VIDMEMALLOC lpVidMemAlloc; - LPDDHAL_VIDMEMFREE lpVidMemFree; -} DDHALDDRAWFNS,*LPDDHALDDRAWFNS; - -/********************************************************************** ******* - * mode info structure - */ -typedef struct _DDHALMODEINFO { - DWORD dwWidth; - DWORD dwHeight; - LONG lPitch; - DWORD dwBPP; - WORD wFlags; - WORD wRefreshRate; - DWORD dwRBitMask; - DWORD dwGBitMask; - DWORD dwBBitMask; - DWORD dwAlphaBitMask; -} DDHALMODEINFO,*LPDDHALMODEINFO; - -#define DDMODEINFO_PALETTIZED 0x0001 -#define DDMODEINFO_MODEX 0x0002 -#define DDMODEINFO_UNSUPPORTED 0x0004 -#define DDMODEINFO_STANDARDVGA 0x0008 -#define DDMODEINFO_MAXREFRESH 0x0010 -#define DDMODEINFO_STEREO 0x0020 - -/********************************************************************** ******* - * video memory info structure - */ -typedef struct _VIDMEM { - DWORD dwFlags; - FLATPTR fpStart; - union { - FLATPTR fpEnd; - DWORD dwWidth; - } DUMMYUNIONNAME1; - DDSCAPS ddsCaps; - DDSCAPS ddsCapsAlt; - union { - LPVMEMHEAP lpHeap; - DWORD dwHeight; - } DUMMYUNIONNAME2; -} VIDMEM,*LPVIDMEM; - -#ifndef __DDK_DDRAWINT_H -#define VIDMEM_ISLINEAR 0x00000001 -#define VIDMEM_ISRECTANGULAR 0x00000002 -#define VIDMEM_ISHEAP 0x00000004 -#define VIDMEM_ISNONLOCAL 0x00000008 -#define VIDMEM_ISWC 0x00000010 -#define VIDMEM_ISDISABLED 0x00000020 -#endif - -typedef struct _VIDMEMINFO { - FLATPTR fpPrimary; - DWORD dwFlags; - DWORD dwDisplayWidth; - DWORD dwDisplayHeight; - LONG lDisplayPitch; - DDPIXELFORMAT ddpfDisplay; - DWORD dwOffscreenAlign; - DWORD dwOverlayAlign; - DWORD dwTextureAlign; - DWORD dwZBufferAlign; - DWORD dwAlphaAlign; - DWORD dwNumHeaps; - LPVIDMEM pvmList; -} VIDMEMINFO,*LPVIDMEMINFO; - -typedef struct _HEAPALIAS { - FLATPTR fpVidMem; - LPVOID lpAlias; - DWORD dwAliasSize; -} HEAPALIAS,*LPHEAPALIAS; - -typedef struct _HEAPALIASINFO { - DWORD dwRefCnt; - DWORD dwFlags; - DWORD dwNumHeaps; - LPHEAPALIAS lpAliases; -} HEAPALIASINFO,*LPHEAPALIASINFO; - -#define HEAPALIASINFO_MAPPEDREAL 0x00000001 -#define HEAPALIASINFO_MAPPEDDUMMY 0x00000002 - -/********************************************************************** ******* - * capabilities structures - */ -typedef struct _DDCORECAPS { - DWORD dwSize; - DWORD dwCaps; - DWORD dwCaps2; - DWORD dwCKeyCaps; - DWORD dwFXCaps; - DWORD dwFXAlphaCaps; - DWORD dwPalCaps; - DWORD dwSVCaps; - DWORD dwAlphaBltConstBitDepths; - DWORD dwAlphaBltPixelBitDepths; - DWORD dwAlphaBltSurfaceBitDepths; - DWORD dwAlphaOverlayConstBitDepths; - DWORD dwAlphaOverlayPixelBitDepths; - DWORD dwAlphaOverlaySurfaceBitDepths; - DWORD dwZBufferBitDepths; - DWORD dwVidMemTotal; - DWORD dwVidMemFree; - DWORD dwMaxVisibleOverlays; - DWORD dwCurrVisibleOverlays; - DWORD dwNumFourCCCodes; - DWORD dwAlignBoundarySrc; - DWORD dwAlignSizeSrc; - DWORD dwAlignBoundaryDest; - DWORD dwAlignSizeDest; - DWORD dwAlignStrideAlign; - DWORD dwRops[DD_ROP_SPACE]; - DDSCAPS ddsCaps; - DWORD dwMinOverlayStretch; - DWORD dwMaxOverlayStretch; - DWORD dwMinLiveVideoStretch; - DWORD dwMaxLiveVideoStretch; - DWORD dwMinHwCodecStretch; - DWORD dwMaxHwCodecStretch; - DWORD dwReserved1; - DWORD dwReserved2; - DWORD dwReserved3; - DWORD dwSVBCaps; - DWORD dwSVBCKeyCaps; - DWORD dwSVBFXCaps; - DWORD dwSVBRops[DD_ROP_SPACE]; - DWORD dwVSBCaps; - DWORD dwVSBCKeyCaps; - DWORD dwVSBFXCaps; - DWORD dwVSBRops[DD_ROP_SPACE]; - DWORD dwSSBCaps; - DWORD dwSSBCKeyCaps; - DWORD dwSSBFXCaps; - DWORD dwSSBRops[DD_ROP_SPACE]; - DWORD dwMaxVideoPorts; - DWORD dwCurrVideoPorts; - DWORD dwSVBCaps2; -} DDCORECAPS,*LPDDCORECAPS; - -typedef struct _DDNONLOCALVIDMEMCAPS { - DWORD dwSize; - DWORD dwNLVBCaps; - DWORD dwNLVBCaps2; - DWORD dwNLVBCKeyCaps; - DWORD dwNLVBFXCaps; - DWORD dwNLVBRops[DD_ROP_SPACE]; -} DDNONLOCALVIDMEMCAPS,*LPDDNONLOCALVIDMEMCAPS; - -#define DDSCAPS_EXECUTEBUFFER DDSCAPS_RESERVED2 -#define DDSCAPS2_VERTEXBUFFER DDSCAPS2_RESERVED1 -#define DDSCAPS2_COMMANDBUFFER DDSCAPS2_RESERVED2 - -/********************************************************************** ******* - * ddraw->driver callbacks - */ -#define DDHAL_DRIVER_NOTHANDLED 0 -#define DDHAL_DRIVER_HANDLED 1 -#define DDHAL_DRIVER_NOCKEYHW 2 - -typedef struct _DDHAL_DESTROYDRIVERDATA *LPDDHAL_DESTROYDRIVERDATA; -typedef struct _DDHAL_CREATESURFACEDATA *LPDDHAL_CREATESURFACEDATA; -typedef struct _DDHAL_DRVSETCOLORKEYDATA *LPDDHAL_DRVSETCOLORKEYDATA; -typedef struct _DDHAL_SETMODEDATA *LPDDHAL_SETMODEDATA; -typedef struct _DDHAL_WAITFORVERTICALBLANKDATA *LPDDHAL_WAITFORVERTICALBLANKDATA; -typedef struct _DDHAL_CANCREATESURFACEDATA *LPDDHAL_CANCREATESURFACEDATA; -typedef struct _DDHAL_CREATEPALETTEDATA *LPDDHAL_CREATEPALETTEDATA; -typedef struct _DDHAL_GETSCANLINEDATA *LPDDHAL_GETSCANLINEDATA; -typedef struct _DDHAL_SETEXCLUSIVEMODEDATA *LPDDHAL_SETEXCLUSIVEMODEDATA; -typedef struct _DDHAL_FLIPTOGDISURFACEDATA *LPDDHAL_FLIPTOGDISURFACEDATA; - -typedef DWORD (PASCAL *LPDDHAL_DESTROYDRIVER) (LPDDHAL_DESTROYDRIVERDATA); -typedef DWORD (PASCAL *LPDDHAL_CREATESURFACE) (LPDDHAL_CREATESURFACEDATA); -typedef DWORD (PASCAL *LPDDHAL_SETCOLORKEY) (LPDDHAL_DRVSETCOLORKEYDATA); -typedef DWORD (PASCAL *LPDDHAL_SETMODE) (LPDDHAL_SETMODEDATA); -typedef DWORD (PASCAL *LPDDHAL_WAITFORVERTICALBLANK)(LPDDHAL_WAITFORVERTICALBLANKDATA); -typedef DWORD (PASCAL *LPDDHAL_CANCREATESURFACE) (LPDDHAL_CANCREATESURFACEDATA ); -typedef DWORD (PASCAL *LPDDHAL_CREATEPALETTE) (LPDDHAL_CREATEPALETTEDATA); -typedef DWORD (PASCAL *LPDDHAL_GETSCANLINE) (LPDDHAL_GETSCANLINEDATA); -typedef DWORD (PASCAL *LPDDHAL_SETEXCLUSIVEMODE) (LPDDHAL_SETEXCLUSIVEMODEDATA); -typedef DWORD (PASCAL *LPDDHAL_FLIPTOGDISURFACE) (LPDDHAL_FLIPTOGDISURFACEDATA); - -typedef struct _DDHAL_DDCALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHAL_DESTROYDRIVER DestroyDriver; - LPDDHAL_CREATESURFACE CreateSurface; - LPDDHAL_SETCOLORKEY SetColorKey; - LPDDHAL_SETMODE SetMode; - LPDDHAL_WAITFORVERTICALBLANK WaitForVerticalBlank; - LPDDHAL_CANCREATESURFACE CanCreateSurface; - LPDDHAL_CREATEPALETTE CreatePalette; - LPDDHAL_GETSCANLINE GetScanLine; - /* DirectX 2 */ - LPDDHAL_SETEXCLUSIVEMODE SetExclusiveMode; - LPDDHAL_FLIPTOGDISURFACE FlipToGDISurface; -} DDHAL_DDCALLBACKS,*LPDDHAL_DDCALLBACKS; - -typedef struct _DDHAL_DESTROYSURFACEDATA *LPDDHAL_DESTROYSURFACEDATA; -typedef struct _DDHAL_FLIPDATA *LPDDHAL_FLIPDATA; -typedef struct _DDHAL_SETCLIPLISTDATA *LPDDHAL_SETCLIPLISTDATA; -typedef struct _DDHAL_LOCKDATA *LPDDHAL_LOCKDATA; -typedef struct _DDHAL_UNLOCKDATA *LPDDHAL_UNLOCKDATA; -typedef struct _DDHAL_BLTDATA *LPDDHAL_BLTDATA; -typedef struct _DDHAL_SETCOLORKEYDATA *LPDDHAL_SETCOLORKEYDATA; -typedef struct _DDHAL_ADDATTACHEDSURFACEDATA *LPDDHAL_ADDATTACHEDSURFACEDATA; -typedef struct _DDHAL_GETBLTSTATUSDATA *LPDDHAL_GETBLTSTATUSDATA; -typedef struct _DDHAL_GETFLIPSTATUSDATA *LPDDHAL_GETFLIPSTATUSDATA; -typedef struct _DDHAL_UPDATEOVERLAYDATA *LPDDHAL_UPDATEOVERLAYDATA; -typedef struct _DDHAL_SETOVERLAYPOSITIONDATA *LPDDHAL_SETOVERLAYPOSITIONDATA; -typedef struct _DDHAL_SETPALETTEDATA *LPDDHAL_SETPALETTEDATA; - -typedef DWORD (PASCAL *LPDDHALSURFCB_DESTROYSURFACE) (LPDDHAL_DESTROYSURFACEDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_FLIP) (LPDDHAL_FLIPDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_SETCLIPLIST) (LPDDHAL_SETCLIPLISTDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_LOCK) (LPDDHAL_LOCKDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_UNLOCK) (LPDDHAL_UNLOCKDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_BLT) (LPDDHAL_BLTDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_SETCOLORKEY) (LPDDHAL_SETCOLORKEYDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_ADDATTACHEDSURFACE)(LPDDHAL_ADDATTACHEDSURFACEDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_GETBLTSTATUS) (LPDDHAL_GETBLTSTATUSDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_GETFLIPSTATUS) (LPDDHAL_GETFLIPSTATUSDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_UPDATEOVERLAY) (LPDDHAL_UPDATEOVERLAYDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_SETOVERLAYPOSITION)(LPDDHAL_SETOVERLAYPOSITIONDATA); -typedef DWORD (PASCAL *LPDDHALSURFCB_SETPALETTE) (LPDDHAL_SETPALETTEDATA); - -typedef struct _DDHAL_DDSURFACECALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHALSURFCB_DESTROYSURFACE DestroySurface; - LPDDHALSURFCB_FLIP Flip; - LPDDHALSURFCB_SETCLIPLIST SetClipList; - LPDDHALSURFCB_LOCK Lock; - LPDDHALSURFCB_UNLOCK Unlock; - LPDDHALSURFCB_BLT Blt; - LPDDHALSURFCB_SETCOLORKEY SetColorKey; - LPDDHALSURFCB_ADDATTACHEDSURFACE AddAttachedSurface; - LPDDHALSURFCB_GETBLTSTATUS GetBltStatus; - LPDDHALSURFCB_GETFLIPSTATUS GetFlipStatus; - LPDDHALSURFCB_UPDATEOVERLAY UpdateOverlay; - LPDDHALSURFCB_SETOVERLAYPOSITION SetOverlayPosition; - LPVOID reserved4; - LPDDHALSURFCB_SETPALETTE SetPalette; -} DDHAL_DDSURFACECALLBACKS,*LPDDHAL_DDSURFACECALLBACKS; - -typedef struct _DDHAL_DESTROYPALETTEDATA *LPDDHAL_DESTROYPALETTEDATA; -typedef struct _DDHAL_SETENTRIESDATA *LPDDHAL_SETENTRIESDATA; - -typedef DWORD (PASCAL *LPDDHALPALCB_DESTROYPALETTE)(LPDDHAL_DESTROYPALETTEDATA); -typedef DWORD (PASCAL *LPDDHALPALCB_SETENTRIES) (LPDDHAL_SETENTRIESDATA); - -typedef struct _DDHAL_DDPALETTECALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHALPALCB_DESTROYPALETTE DestroyPalette; - LPDDHALPALCB_SETENTRIES SetEntries; -} DDHAL_DDPALETTECALLBACKS,*LPDDHAL_DDPALETTECALLBACKS; - -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_CANCREATEEXEBUF)(LPDDHAL_CANCREATESURFACEDATA); -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_CREATEEXEBUF) (LPDDHAL_CREATESURFACEDATA); -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_DESTROYEXEBUF) (LPDDHAL_DESTROYSURFACEDATA); -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_LOCKEXEBUF) (LPDDHAL_LOCKDATA); -typedef DWORD (PASCAL *LPDDHALEXEBUFCB_UNLOCKEXEBUF) (LPDDHAL_UNLOCKDATA); - -typedef struct _DDHAL_DDEXEBUFCALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHALEXEBUFCB_CANCREATEEXEBUF CanCreateExecuteBuffer; - LPDDHALEXEBUFCB_CREATEEXEBUF CreateExecuteBuffer; - LPDDHALEXEBUFCB_DESTROYEXEBUF DestroyExecuteBuffer; - LPDDHALEXEBUFCB_LOCKEXEBUF LockExecuteBuffer; - LPDDHALEXEBUFCB_UNLOCKEXEBUF UnlockExecuteBuffer; -} DDHAL_DDEXEBUFCALLBACKS,*LPDDHAL_DDEXEBUFCALLBACKS; - -typedef struct _DDHAL_GETAVAILDRIVERMEMORYDATA *LPDDHAL_GETAVAILDRIVERMEMORYDATA; -typedef struct _DDHAL_UPDATENONLOCALHEAPDATA *LPDDHAL_UPDATENONLOCALHEAPDATA; -typedef struct _DDHAL_GETHEAPALIGNMENTDATA *LPDDHAL_GETHEAPALIGNMENTDATA; - -typedef DWORD (PASCAL *LPDDHAL_GETAVAILDRIVERMEMORY)(LPDDHAL_GETAVAILDRIVERMEMORYDATA); -typedef DWORD (PASCAL *LPDDHAL_UPDATENONLOCALHEAP) (LPDDHAL_UPDATENONLOCALHEAPDATA); -typedef DWORD (PASCAL *LPDDHAL_GETHEAPALIGNMENT) (LPDDHAL_GETHEAPALIGNMENTDATA); - -typedef struct _DDHAL_DDMISCELLANEOUSCALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory; - LPDDHAL_UPDATENONLOCALHEAP UpdateNonLocalHeap; - LPDDHAL_GETHEAPALIGNMENT GetHeapAlignment; - LPDDHALSURFCB_GETBLTSTATUS GetSysmemBltStatus; -} DDHAL_DDMISCELLANEOUSCALLBACKS,*LPDDHAL_DDMISCELLANEOUSCALLBACKS; - -typedef struct _DDHAL_CREATESURFACEEXDATA *LPDDHAL_CREATESURFACEEXDATA; -typedef struct _DDHAL_GETDRIVERSTATEDATA *LPDDHAL_GETDRIVERSTATEDATA; -typedef struct _DDHAL_DESTROYDDLOCALDATA *LPDDHAL_DESTROYDDLOCALDATA; - -typedef DWORD (PASCAL *LPDDHAL_CREATESURFACEEX)(LPDDHAL_CREATESURFACEEXDATA); -typedef DWORD (PASCAL *LPDDHAL_GETDRIVERSTATE) (LPDDHAL_GETDRIVERSTATEDATA); -typedef DWORD (PASCAL *LPDDHAL_DESTROYDDLOCAL) (LPDDHAL_DESTROYDDLOCALDATA); - -typedef struct _DDHAL_DDMISCELLANEOUS2CALLBACKS { - DWORD dwSize; - DWORD dwFlags; - LPVOID Reserved; - LPDDHAL_CREATESURFACEEX CreateSurfaceEx; - LPDDHAL_GETDRIVERSTATE GetDriverState; - LPDDHAL_DESTROYDDLOCAL DestroyDDLocal; -} DDHAL_DDMISCELLANEOUS2CALLBACKS,*LPDDHAL_DDMISCELLANEOUS2CALLBACKS; - -typedef HRESULT (WINAPI *LPDDGAMMACALIBRATORPROC)(LPDDGAMMARAMP, LPBYTE); - -/********************************************************************** ******* - * driver info structure - * - * The HAL is queried for additional callbacks via the GetDriverInfo callback. - */ -typedef struct _DDHAL_GETDRIVERINFODATA *LPDDHAL_GETDRIVERINFODATA; -typedef DWORD (PASCAL *LPDDHAL_GETDRIVERINFO)(LPDDHAL_GETDRIVERINFODATA); - -typedef struct _DDHALINFO { - DWORD dwSize; - LPDDHAL_DDCALLBACKS lpDDCallbacks; - LPDDHAL_DDSURFACECALLBACKS lpDDSurfaceCallbacks; - LPDDHAL_DDPALETTECALLBACKS lpDDPaletteCallbacks; - VIDMEMINFO vmiData; - DDCORECAPS ddCaps; - DWORD dwMonitorFrequency; - LPDDHAL_GETDRIVERINFO GetDriverInfo; - DWORD dwModeIndex; - LPDWORD lpdwFourCC; - DWORD dwNumModes; - LPDDHALMODEINFO lpModeInfo; - DWORD dwFlags; - LPVOID lpPDevice; - DWORD hInstance; - /* DirectX 2 */ - ULONG_PTR lpD3DGlobalDriverData; - ULONG_PTR lpD3DHALCallbacks; - LPDDHAL_DDEXEBUFCALLBACKS lpDDExeBufCallbacks; -} DDHALINFO; - -#define DDHALINFO_ISPRIMARYDISPLAY 0x00000001 -#define DDHALINFO_MODEXILLEGAL 0x00000002 -#define DDHALINFO_GETDRIVERINFOSET 0x00000004 - -/* where the high-level ddraw implementation stores the callbacks */ -typedef struct _DDHAL_CALLBACKS { - DDHAL_DDCALLBACKS cbDDCallbacks; - DDHAL_DDSURFACECALLBACKS cbDDSurfaceCallbacks; - DDHAL_DDPALETTECALLBACKS cbDDPaletteCallbacks; - DDHAL_DDCALLBACKS HALDD; - DDHAL_DDSURFACECALLBACKS HALDDSurface; - DDHAL_DDPALETTECALLBACKS HALDDPalette; - DDHAL_DDCALLBACKS HELDD; - DDHAL_DDSURFACECALLBACKS HELDDSurface; - DDHAL_DDPALETTECALLBACKS HELDDPalette; - DDHAL_DDEXEBUFCALLBACKS cbDDExeBufCallbacks; - DDHAL_DDEXEBUFCALLBACKS HALDDExeBuf; - DDHAL_DDEXEBUFCALLBACKS HELDDExeBuf; - /* there's more... videoport, colorcontrol, misc, and motion compensation callbacks... */ -} DDHAL_CALLBACKS,*LPDDHAL_CALLBACKS; - -/********************************************************************** ******* - * parameter structures - */ -typedef struct _DDHAL_DESTROYDRIVERDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - HRESULT ddRVal; - LPDDHAL_DESTROYDRIVER DestroyDriver; -} DDHAL_DESTROYDRIVERDATA; - -typedef struct _DDHAL_SETMODEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DWORD dwModeIndex; - HRESULT ddRVal; - LPDDHAL_SETMODE SetMode; - BOOL inexcl; - BOOL useRefreshRate; -} DDHAL_SETMODEDATA; - -typedef struct _DDHAL_CREATESURFACEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDSURFACEDESC lpDDSurfaceDesc; - LPDDRAWI_DDRAWSURFACE_LCL * lplpSList; - DWORD dwSCnt; - HRESULT ddRVal; - LPDDHAL_CREATESURFACE CreateSurface; -} DDHAL_CREATESURFACEDATA; - -typedef struct _DDHAL_CANCREATESURFACEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDSURFACEDESC lpDDSurfaceDesc; - DWORD bIsDifferentPixelFormat; - HRESULT ddRVal; - LPDDHAL_CANCREATESURFACE CanCreateSurface; -} DDHAL_CANCREATESURFACEDATA; - -typedef struct _DDHAL_CREATEPALETTEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWPALETTE_GBL lpDDPalette; - LPPALETTEENTRY lpColorTable; - HRESULT ddRVal; - LPDDHAL_CREATEPALETTE CreatePalette; - BOOL is_excl; -} DDHAL_CREATEPALETTEDATA; - -typedef struct _DDHAL_SETEXCLUSIVEMODEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DWORD dwEnterExcl; - DWORD dwReserved; - HRESULT ddRVal; - LPDDHAL_SETEXCLUSIVEMODE SetExclusiveMode; -} DDHAL_SETEXCLUSIVEMODEDATA; - -/* surfaces */ -typedef struct _DDHAL_DESTROYSURFACEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - HRESULT ddRVal; - LPDDHALSURFCB_DESTROYSURFACE DestroySurface; -} DDHAL_DESTROYSURFACEDATA; - -typedef struct _DDHAL_FLIPDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfCurr; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfTarg; - DWORD dwFlags; - HRESULT ddRVal; - LPDDHALSURFCB_FLIP Flip; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfCurrLeft; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfTargLeft; -} DDHAL_FLIPDATA; - -typedef struct _DDHAL_LOCKDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - DWORD bHasRect; - RECTL rArea; - LPVOID lpSurfData; - HRESULT ddRVal; - LPDDHALSURFCB_LOCK Lock; - DWORD dwFlags; -} DDHAL_LOCKDATA; - -typedef struct _DDHAL_UNLOCKDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - HRESULT ddRVal; - LPDDHALSURFCB_UNLOCK Unlock; -} DDHAL_UNLOCKDATA; - -typedef struct _DDHAL_BLTDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface; - RECTL rDest; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; - RECTL rSrc; - DWORD dwFlags; - DWORD dwROPFlags; - DDBLTFX bltFX; - HRESULT ddRVal; - LPDDHALSURFCB_BLT Blt; - BOOL IsClipped; - RECTL rOrigDest; - RECTL rOrigSrc; - DWORD dwRectCnt; - LPRECT prDestRects; -} DDHAL_BLTDATA; - -typedef struct _DDHAL_SETPALETTEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - LPDDRAWI_DDRAWPALETTE_GBL lpDDPalette; - HRESULT ddRVal; - LPDDHALSURFCB_SETPALETTE SetPalette; - BOOL Attach; -} DDHAL_SETPALETTEDATA; - -/* palettes */ -typedef struct _DDHAL_DESTROYPALETTEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWPALETTE_GBL lpDDPalette; - HRESULT ddRVal; - LPDDHALPALCB_DESTROYPALETTE DestroyPalette; -} DDHAL_DESTROYPALETTEDATA; - -typedef struct _DDHAL_SETENTRIESDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWPALETTE_GBL lpDDPalette; - DWORD dwBase; - DWORD dwNumEntries; - LPPALETTEENTRY lpEntries; - HRESULT ddRVal; - LPDDHALPALCB_SETENTRIES SetEntries; -} DDHAL_SETENTRIESDATA; - -typedef struct _DDHAL_GETDRIVERINFODATA { - DWORD dwSize; - DWORD dwFlags; - GUID guidInfo; - DWORD dwExpectedSize; - LPVOID lpvData; - DWORD dwActualSize; - HRESULT ddRVal; - ULONG_PTR dwContext; -} DDHAL_GETDRIVERINFODATA; - -/********************************************************************** ******* - * high-level ddraw implementation structures - */ -#ifndef __USE_W32API -typedef DWORD IUnknown; /* FIXME: implement proper definition */ -#endif -typedef struct _IUNKNOWN_LIST { - struct _IUNKNOWN_LIST * lpLink; - LPGUID lpGuid; - IUnknown * lpIUnknown; -} IUNKNOWN_LIST,*LPIUNKNOWN_LIST; - -typedef struct _PROCESS_LIST { - struct _PROCESS_LIST * lpLink; - DWORD dwProcessId; - DWORD dwRefCnt; - DWORD dwAlphaDepth; - DWORD dwZDepth; -} PROCESS_LIST,*LPPROCESS_LIST; - -typedef struct _ATTACHLIST { - DWORD dwFlags; - struct _ATTACHLIST * lpLink; - LPDDRAWI_DDRAWSURFACE_LCL lpAttached; - LPDDRAWI_DDRAWSURFACE_INT lpIAttached; -} ATTACHLIST,*LPATTACHLIST; - -#define DDAL_IMPLICIT 0x00000001 - -typedef struct _ACCESSRECTLIST { - struct _ACCESSRECTLIST * lpLink; - RECT rDest; - LPDDRAWI_DIRECTDRAW_LCL lpOwner; - LPVOID lpSurfaceData; - DWORD dwFlags; - LPHEAPALIASINFO lpHeapAliasInfo; -} ACCESSRECTLIST,*LPACCESSRECTLIST; - -#define ACCESSRECT_VRAMSTYLE 0x00000001 -#define ACCESSRECT_NOTHOLDINGWIN16LOCK 0x00000002 -#define ACCESSRECT_BROKEN 0x00000004 - -typedef struct _DBLNODE { - struct _DBLNODE * next; - struct _DBLNODE * prev; - LPDDRAWI_DDRAWSURFACE_LCL object; - LPDDRAWI_DDRAWSURFACE_INT object_int; -} DBLNODE,*LPDBLNODE; - -typedef struct _DDRAWI_DIRECTDRAW_INT { - LPVOID lpVtbl; - LPDDRAWI_DIRECTDRAW_LCL lpLcl; - LPDDRAWI_DIRECTDRAW_INT lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DIRECTDRAW_INT; - -typedef struct _DDRAWI_DIRECTDRAW_LCL { - DWORD lpDDMore; - LPDDRAWI_DIRECTDRAW_GBL lpGbl; - DWORD dwUnused0; - DWORD dwLocalFlags; - DWORD dwLocalRefCnt; - DWORD dwProcessId; - IUnknown * pUnkOuter; - DWORD dwObsolete1; - ULONG_PTR hWnd; - ULONG_PTR hDC; - DWORD dwErrorMode; - LPDDRAWI_DDRAWSURFACE_INT lpPrimary; - LPDDRAWI_DDRAWSURFACE_INT lpCB; - DWORD dwPreferredMode; - /* DirectX 2 */ - HINSTANCE hD3DInstance; - IUnknown * pD3DIUnknown; - LPDDHAL_CALLBACKS lpDDCB; - ULONG_PTR hDDVxd; - /* DirectX 5.0 */ - DWORD dwAppHackFlags; - /* DirectX 5.0A */ - ULONG_PTR hFocusWnd; - DWORD dwHotTracking; - DWORD dwIMEState; - /* DirectX 6.0 */ - ULONG_PTR hWndPopup; - ULONG_PTR hDD; - ULONG_PTR hGammaCalibrator; - LPDDGAMMACALIBRATORPROC lpGammaCalibrator; -} DDRAWI_DIRECTDRAW_LCL; - -#define DDRAWILCL_HASEXCLUSIVEMODE 0x00000001 -#define DDRAWILCL_ISFULLSCREEN 0x00000002 -#define DDRAWILCL_SETCOOPCALLED 0x00000004 -#define DDRAWILCL_ACTIVEYES 0x00000008 -#define DDRAWILCL_ACTIVENO 0x00000010 -#define DDRAWILCL_HOOKEDHWND 0x00000020 -#define DDRAWILCL_ALLOWMODEX 0x00000040 -#define DDRAWILCL_V1SCLBEHAVIOUR 0x00000080 -#define DDRAWILCL_MODEHASBEENCHANGED 0x00000100 -#define DDRAWILCL_CREATEDWINDOW 0x00000200 -#define DDRAWILCL_DIRTYDC 0x00000400 -#define DDRAWILCL_DISABLEINACTIVATE 0x00000800 -#define DDRAWILCL_CURSORCLIPPED 0x00001000 -#define DDRAWILCL_EXPLICITMONITOR 0x00002000 -#define DDRAWILCL_MULTITHREADED 0x00004000 -#define DDRAWILCL_FPUSETUP 0x00008000 -#define DDRAWILCL_POWEREDDOWN 0x00010000 -#define DDRAWILCL_DIRECTDRAW7 0x00020000 -#define DDRAWILCL_ATTEMPTEDD3DCONTEXT 0x00040000 -#define DDRAWILCL_FPUPRESERVE 0x00080000 - -typedef struct _DDRAWI_DIRECTDRAW_GBL { - DWORD dwRefCnt; - DWORD dwFlags; - FLATPTR fpPrimaryOrig; - DDCORECAPS ddCaps; - DWORD dwInternal1; - DWORD dwUnused1[9]; - LPDDHAL_CALLBACKS lpDDCBtmp; - LPDDRAWI_DDRAWSURFACE_INT dsList; - LPDDRAWI_DDRAWPALETTE_INT palList; - LPDDRAWI_DDRAWCLIPPER_INT clipperList; - LPDDRAWI_DIRECTDRAW_GBL lp16DD; - DWORD dwMaxOverlays; - DWORD dwCurrOverlays; - DWORD dwMonitorFrequency; - DDCORECAPS ddHELCaps; - DWORD dwUnused2[50]; - DDCOLORKEY ddckCKDestOverlay; - DDCOLORKEY ddckCKSrcOverlay; - VIDMEMINFO vmiData; - LPVOID lpDriverHandle; - LPDDRAWI_DIRECTDRAW_LCL lpExclusiveOwner; - DWORD dwModeIndex; - DWORD dwModeIndexOrig; - DWORD dwNumFourCC; - LPDWORD lpdwFourCC; - DWORD dwNumModes; - LPDDHALMODEINFO lpModeInfo; - PROCESS_LIST plProcessList; - DWORD dwSurfaceLockCount; - DWORD dwAliasedLockCnt; - ULONG_PTR dwReserved3; - ULONG_PTR hDD; - char cObsolete[12]; - DWORD dwReserved1; - DWORD dwReserved2; - DBLNODE dbnOverlayRoot; - volatile LPWORD lpwPDeviceFlags; - DWORD dwPDevice; - DWORD dwWin16LockCnt; - DWORD dwUnused3; - DWORD hInstance; - DWORD dwEvent16; - DWORD dwSaveNumModes; - /* DirectX 2 */ - ULONG_PTR lpD3DGlobalDriverData; - ULONG_PTR lpD3DHALCallbacks; - DDCORECAPS ddBothCaps; - /* DirectX 5.0 */ - LPDDVIDEOPORTCAPS lpDDVideoPortCaps; - LPDDRAWI_DDVIDEOPORT_INT dvpList; - ULONG_PTR lpD3DHALCallbacks2; - RECT rectDevice; - DWORD cMonitors; - LPVOID gpbmiSrc; - LPVOID gpbmiDest; - LPHEAPALIASINFO phaiHeapAliases; - ULONG_PTR hKernelHandle; - ULONG_PTR pfnNotifyProc; - LPDDKERNELCAPS lpDDKernelCaps; - LPDDNONLOCALVIDMEMCAPS lpddNLVCaps; - LPDDNONLOCALVIDMEMCAPS lpddNLVHELCaps; - LPDDNONLOCALVIDMEMCAPS lpddNLVBothCaps; - ULONG_PTR lpD3DExtendedCaps; - /* DirectX 5.0A */ - DWORD dwDOSBoxEvent; - RECT rectDesktop; - char cDriverName[MAX_DRIVER_NAME]; - /* DirectX 6.0 */ - ULONG_PTR lpD3DHALCallbacks3; - DWORD dwNumZPixelFormats; - LPDDPIXELFORMAT lpZPixelFormats; - LPDDRAWI_DDMOTIONCOMP_INT mcList; - DWORD hDDVxd; - DDSCAPSEX ddsCapsMore; -} DDRAWI_DIRECTDRAW_GBL; - -#define DDRAWI_VIRTUALDESKTOP 0x00000008 -#define DDRAWI_MODEX 0x00000010 -#define DDRAWI_DISPLAYDRV 0x00000020 -#define DDRAWI_FULLSCREEN 0x00000040 -#define DDRAWI_MODECHANGED 0x00000080 -#define DDRAWI_NOHARDWARE 0x00000100 -#define DDRAWI_PALETTEINIT 0x00000200 -#define DDRAWI_NOEMULATION 0x00000400 -/* more... */ - -/* surfaces */ -typedef struct _DDRAWI_DDRAWSURFACE_INT { - LPVOID lpVtbl; - LPDDRAWI_DDRAWSURFACE_LCL lpLcl; - LPDDRAWI_DDRAWSURFACE_INT lpLink; - DWORD dwIntRefCnt; -} DDRAWI_DDRAWSURFACE_INT; - -typedef struct _DDRAWI_DDRAWSURFACE_GBL { - DWORD dwRefCnt; - DWORD dwGlobalFlags; - union { - LPACCESSRECTLIST lpRectList; - DWORD dwBlockSizeY; - } DUMMYUNIONNAME1; - union { - LPVMEMHEAP lpVidMemHeap; - DWORD dwBlockSizeX; - } DUMMYUNIONNAME2; - union { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPVOID lpDDHandle; - } DUMMYUNIONNAME3; - FLATPTR fpVidMem; - union { - LONG lPitch; - DWORD dwLinearSize; - } DUMMYUNIONNAME4; - WORD wHeight; - WORD wWidth; - DWORD dwUsageCount; - ULONG_PTR dwReserved1; /* for display driver use */ - /* optional (defaults to primary surface pixelformat) */ - DDPIXELFORMAT ddpfSurface; -} DDRAWI_DDRAWSURFACE_GBL; - -#define DDRAWISURFGBL_MEMFREE 0x00000001 -#define DDRAWISURFGBL_SYSMEMREQUESTED 0x00000002 -#define DDRAWISURFGBL_ISGDISURFACE 0x00000004 -#define DDRAWISURFGBL_SOFTWAREAUTOFLIP 0x00000008 -#define DDRAWISURFGBL_LOCKNOTHOLDINGWIN16LOCK 0x00000010 -#define DDRAWISURFGBL_LOCKVRAMSTYLE 0x00000020 -#define DDRAWISURFGBL_LOCKBROKEN 0x00000040 -#define DDRAWISURFGBL_IMPLICITHANDLE 0x00000080 -#define DDRAWISURFGBL_ISCLIENTMEM 0x00000100 -#define DDRAWISURFGBL_HARDWAREOPSOURCE 0x00000200 -#define DDRAWISURFGBL_HARDWAREOPDEST 0x00000400 -#define DDRAWISURFGBL_HARDWAREOPSTARTED 0x00000600 -#define DDRAWISURFGBL_VPORTINTERLEAVED 0x00000800 -#define DDRAWISURFGBL_VPORTDATA 0x00001000 -#define DDRAWISURFGBL_LATEALLOCATELINEAR 0x00002000 -#define DDRAWISURFGBL_SYSMEMEXECUTEBUFFER 0x00004000 -#define DDRAWISURFGBL_FASTLOCKHELD 0x00008000 -#define DDRAWISURFGBL_READONLYLOCKHELD 0x00010000 - -typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE { - DWORD dwSize; - union { - DWORD dwPhysicalPageTable; - FLATPTR fpPhysicalVidMem; - } DUMMYUNIONNAME1; - LPDWORD pPageTable; - DWORD cPages; - ULONG_PTR dwSavedDCContext; - FLATPTR fpAliasedVidMem; - ULONG_PTR dwDriverReserved; - ULONG_PTR dwHELReserved; - DWORD cPageUnlocks; - ULONG_PTR hKernelSurface; - DWORD dwKernelRefCnt; - LPDDCOLORCONTROL lpColorInfo; - FLATPTR fpNTAlias; - DWORD dwContentsStamp; - LPVOID lpvUnswappedDriverReserved; - LPVOID lpDDRAWReserved2; - DWORD dwDDRAWReserved1; - DWORD dwDDRAWReserved2; - FLATPTR fpAliasOfVidMem; -} DDRAWI_DDRAWSURFACE_GBL_MORE; - -/* the MS version of this macro was somewhat obfuscated and unreadable - * (possibly because of mediocre MS coders)... so I simplified it... - * (and so I commit no copyright violations either, hah) */ -#define GET_LPDDRAWSURFACE_GBL_MORE(psurf_gbl) \ - (*(((LPDDRAWI_DDRAWSURFACE_GBL_MORE *)(psurf_gbl)) - 1)) - -typedef struct _DDRAWI_DDRAWSURFACE_MORE { - DWORD dwSize; - IUNKNOWN_LIST * lpIUnknowns; - LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; - DWORD dwPageLockCount; - DWORD dwBytesAllocated; - LPDDRAWI_DIRECTDRAW_INT lpDD_int; - DWORD dwMipMapCount; - LPDDRAWI_DDRAWCLIPPER_INT lpDDIClipper; - /* DirectX 5.0 */ - LPHEAPALIASINFO lpHeapAliasInfo; - DWORD dwOverlayFlags; - VOID *rgjunc; - LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - LPDDOVERLAYFX lpddOverlayFX; - DDSCAPSEX ddsCapsEx; - DWORD dwTextureStage; - LPVOID lpDDRAWReserved; - LPVOID lpDDRAWReserved2; - LPVOID lpDDrawReserved3; - DWORD dwDDrawReserved4; - LPVOID lpDDrawReserved5; - LPDWORD lpGammaRamp; - LPDWORD lpOriginalGammaRamp; - LPVOID lpDDrawReserved6; - DWORD dwSurfaceHandle; - DWORD qwDDrawReserved8[2]; - LPVOID lpDDrawReserved9; - DWORD cSurfaces; - LPDDSURFACEDESC2 pCreatedDDSurfaceDesc2; - LPDDRAWI_DDRAWSURFACE_LCL *slist; - DWORD dwFVF; - LPVOID lpVB; -} DDRAWI_DDRAWSURFACE_MORE; - -typedef struct _DDRAWI_DDRAWSURFACE_LCL { - LPDDRAWI_DDRAWSURFACE_MORE lpSurfMore; - LPDDRAWI_DDRAWSURFACE_GBL lpGbl; - ULONG_PTR hDDSurface; - LPATTACHLIST lpAttachList; - LPATTACHLIST lpAttachListFrom; - DWORD dwLocalRefCnt; - DWORD dwProcessId; - DWORD dwFlags; - DDSCAPS ddsCaps; - LPDDRAWI_DDRAWPALETTE_INT lpDDPalette; - LPDDRAWI_DDRAWCLIPPER_LCL lpDDClipper; - DWORD dwModeCreatedIn; - DWORD dwBackBufferCount; - DDCOLORKEY ddckCKDestBlt; - DDCOLORKEY ddckCKSrcBlt; - ULONG_PTR hDC; - ULONG_PTR dwReserved1; /* for display driver use */ - /* overlays only */ - DDCOLORKEY ddckCKSrcOverlay; - DDCOLORKEY ddckCKDestOverlay; - LPDDRAWI_DDRAWSURFACE_INT lpSurfaceOverlaying; - DBLNODE dbnOverlayNode; - RECT rcOverlaySrc; - RECT rcOverlayDest; - DWORD dwClrXparent; - DWORD dwAlpha; - LONG lOverlayX; - LONG lOverlayY; -} DDRAWI_DDRAWSURFACE_LCL; - -#define DDRAWISURF_ATTACHED 0x00000001 -#define DDRAWISURF_IMPLICITCREATE 0x00000002 -#define DDRAWISURF_ISFREE 0x00000004 -#define DDRAWISURF_ATTACHED_FROM 0x00000008 -#define DDRAWISURF_IMPLICITROOT 0x00000010 -#define DDRAWISURF_PARTOFPRIMARYCHAIN 0x00000020 -#define DDRAWISURF_DATAISALIASED 0x00000040 -#define DDRAWISURF_HASDC 0x00000080 -#define DDRAWISURF_HASCKEYDESTOVERLAY 0x00000100 -#define DDRAWISURF_HASCKEYDESTBLT 0x00000200 -#define DDRAWISURF_HASCKEYSRCOVERLAY 0x00000400 -#ifndef DDRAWISURF_HASCKEYSRCBLT -#define DDRAWISURF_HASCKEYSRCBLT 0x00000800 -#endif -#define DDRAWISURF_LOCKEXCLUDEDCURSOR 0x00001000 -#ifndef DDRAWISURF_HASPIXELFORMAT -#define DDRAWISURF_HASPIXELFORMAT 0x00002000 -#endif -#ifndef DDRAWISURF_HASOVERLAYDATA -#define DDRAWISURF_HASOVERLAYDATA 0x00004000 -#endif [truncated at 1000 lines; 4728 more skipped]

19 years, 2 months

[mbosma] 18728: ... files I forgot to commit.

by mbosma＠svn.reactos.com

... files I forgot to commit. Added: trunk/reactos/lib/ddraw/main/clipper.c Added: trunk/reactos/lib/ddraw/main/color.c Added: trunk/reactos/lib/ddraw/main/gamma.c Added: trunk/reactos/lib/ddraw/main/palette.c _____ Added: trunk/reactos/lib/ddraw/main/clipper.c --- trunk/reactos/lib/ddraw/main/clipper.c 2005-10-23 21:29:30 UTC (rev 18727) +++ trunk/reactos/lib/ddraw/main/clipper.c 2005-10-23 21:31:15 UTC (rev 18728) @@ -0,0 +1,78 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/clipper.c + * PURPOSE: DirectDraw Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + + +HRESULT WINAPI Main_DirectDrawClipper_SetHwnd( + LPDIRECTDRAWCLIPPER iface, DWORD dwFlags, HWND hWnd) +{ + DX_STUB; +} + +ULONG WINAPI Main_DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawClipper_GetClipList( + LPDIRECTDRAWCLIPPER iface, LPRECT lpRect, LPRGNDATA lpClipList, + LPDWORD lpdwSize) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawClipper_SetClipList( + LPDIRECTDRAWCLIPPER iface,LPRGNDATA lprgn,DWORD dwFlag) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawClipper_QueryInterface( + LPDIRECTDRAWCLIPPER iface, REFIID riid, LPVOID* ppvObj) +{ + DX_STUB; +} + +ULONG WINAPI Main_DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawClipper_GetHWnd( + LPDIRECTDRAWCLIPPER iface, HWND* hWndPtr) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawClipper_Initialize( + LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawClipper_IsClipListChanged( + LPDIRECTDRAWCLIPPER iface, BOOL* lpbChanged) +{ + DX_STUB; +} + +static IDirectDrawClipperVtbl DirectDrawClipper_Vtable = +{ + Main_DirectDrawClipper_QueryInterface, + Main_DirectDrawClipper_AddRef, + Main_DirectDrawClipper_Release, + Main_DirectDrawClipper_GetClipList, + Main_DirectDrawClipper_GetHWnd, + Main_DirectDrawClipper_Initialize, + Main_DirectDrawClipper_IsClipListChanged, + Main_DirectDrawClipper_SetClipList, + Main_DirectDrawClipper_SetHwnd +}; Property changes on: trunk/reactos/lib/ddraw/main/clipper.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ddraw/main/color.c --- trunk/reactos/lib/ddraw/main/color.c 2005-10-23 21:29:30 UTC (rev 18727) +++ trunk/reactos/lib/ddraw/main/color.c 2005-10-23 21:31:15 UTC (rev 18728) @@ -0,0 +1,51 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/color.c + * PURPOSE: DirectDraw Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + +HRESULT WINAPI +Main_DirectDrawColorControl_QueryInterface(LPDIRECTDRAWCOLORCONTROL iface, + REFIID riid, LPVOID* ppvObj) +{ + DX_STUB; +} + +ULONG WINAPI +Main_DirectDrawColorControl_AddRef(LPDIRECTDRAWCOLORCONTROL iface) +{ + DX_STUB; +} + +ULONG WINAPI +Main_DirectDrawColorControl_Release(LPDIRECTDRAWCOLORCONTROL iface) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawColorControl_GetColorControls(LPDIRECTDRAWCOLORCONTROL iface, LPDDCOLORCONTROL lpColorControl) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawColorControl_SetColorControls(LPDIRECTDRAWCOLORCONTROL iface, LPDDCOLORCONTROL lpColorControl) +{ + DX_STUB; +} + +IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable = +{ + Main_DirectDrawColorControl_QueryInterface, + Main_DirectDrawColorControl_AddRef, + Main_DirectDrawColorControl_Release, + Main_DirectDrawColorControl_GetColorControls, + Main_DirectDrawColorControl_SetColorControls +}; Property changes on: trunk/reactos/lib/ddraw/main/color.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ddraw/main/gamma.c --- trunk/reactos/lib/ddraw/main/gamma.c 2005-10-23 21:29:30 UTC (rev 18727) +++ trunk/reactos/lib/ddraw/main/gamma.c 2005-10-23 21:31:15 UTC (rev 18728) @@ -0,0 +1,52 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/gamma.c + * PURPOSE: DirectDraw Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + + +HRESULT WINAPI +Main_DirectDrawGammaControl_QueryInterface(LPDIRECTDRAWGAMMACONTROL iface, REFIID riid, + LPVOID *ppObj) +{ + DX_STUB; +} + +ULONG WINAPI +Main_DirectDrawGammaControl_AddRef(LPDIRECTDRAWGAMMACONTROL iface) +{ + DX_STUB; +} + +ULONG WINAPI +Main_DirectDrawGammaControl_Release(LPDIRECTDRAWGAMMACONTROL iface) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawGammaControl_GetGammaRamp(LPDIRECTDRAWGAMMACONTROL iface, DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawGammaControl_SetGammaRamp(LPDIRECTDRAWGAMMACONTROL iface, DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) +{ + DX_STUB; +} + +IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable = +{ + Main_DirectDrawGammaControl_QueryInterface, + Main_DirectDrawGammaControl_AddRef, + Main_DirectDrawGammaControl_Release, + Main_DirectDrawGammaControl_GetGammaRamp, + Main_DirectDrawGammaControl_SetGammaRamp +}; Property changes on: trunk/reactos/lib/ddraw/main/gamma.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ddraw/main/palette.c --- trunk/reactos/lib/ddraw/main/palette.c 2005-10-23 21:29:30 UTC (rev 18727) +++ trunk/reactos/lib/ddraw/main/palette.c 2005-10-23 21:31:15 UTC (rev 18728) @@ -0,0 +1,71 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/palette.c + * PURPOSE: DirectDraw Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + + +HRESULT WINAPI +Main_DirectDrawPalette_GetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, + DWORD dwStart, DWORD dwCount, + LPPALETTEENTRY palent) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawPalette_SetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, + DWORD dwStart, DWORD dwCount, + LPPALETTEENTRY palent) +{ + DX_STUB; +} + +ULONG WINAPI +Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface) +{ + DX_STUB; +} + +ULONG WINAPI Main_DirectDrawPalette_AddRef(LPDIRECTDRAWPALETTE iface) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawPalette_Initialize(LPDIRECTDRAWPALETTE iface, + LPDIRECTDRAW ddraw, DWORD dwFlags, + LPPALETTEENTRY palent) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawPalette_GetCaps(LPDIRECTDRAWPALETTE iface, LPDWORD lpdwCaps) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface, + REFIID refiid, LPVOID *obj) +{ + DX_STUB; +} + +IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = +{ + Main_DirectDrawPalette_QueryInterface, + Main_DirectDrawPalette_AddRef, + Main_DirectDrawPalette_Release, + Main_DirectDrawPalette_GetCaps, + Main_DirectDrawPalette_GetEntries, + Main_DirectDrawPalette_Initialize, + Main_DirectDrawPalette_SetEntries +}; Property changes on: trunk/reactos/lib/ddraw/main/palette.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 2 months

[mbosma] 18727: Add lots of stubs.

by mbosma＠svn.reactos.com

Add lots of stubs. Modified: trunk/reactos/lib/ddraw/ddraw.xml Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/main/surface.c Modified: trunk/reactos/lib/ddraw/main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/ddraw.xml --- trunk/reactos/lib/ddraw/ddraw.xml 2005-10-23 21:19:34 UTC (rev 18726) +++ trunk/reactos/lib/ddraw/ddraw.xml 2005-10-23 21:29:30 UTC (rev 18727) @@ -1,4 +1,4 @@ -<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll"> +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings="true"> <importlibrary definition="ddraw.def" /> <include base="ddraw">.</include> <define name="UNICODE" /> @@ -6,8 +6,6 @@ <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> - - <library>ntdll</library> <library>kernel32</library> <library>gdi32</library> @@ -27,6 +25,10 @@ <directory name="main"> <file>ddraw.c</file> <file>surface.c</file> + <file>clipper.c</file> + <file>color.c</file> + <file>gamma.c</file> + <file>palette.c</file> </directory> <directory name="soft"> _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 21:19:34 UTC (rev 18726) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 21:29:30 UTC (rev 18727) @@ -140,7 +140,7 @@ if (That == NULL) return E_OUTOFMEMORY; - That->lpVtbl = &DDrawSurface_VTable; + That->lpVtbl = &DirectDrawSurface_Vtable; That->ref = 1; *ppSurf = (LPDIRECTDRAWSURFACE7)That; @@ -380,7 +380,7 @@ DX_STUB; } -IDirectDraw7Vtbl DirectDraw_VTable = +IDirectDraw7Vtbl DirectDraw_Vtable = { Main_DirectDraw_QueryInterface, Main_DirectDraw_AddRef, _____ Modified: trunk/reactos/lib/ddraw/main/surface.c --- trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 21:19:34 UTC (rev 18726) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 21:29:30 UTC (rev 18727) @@ -421,7 +421,7 @@ DX_STUB; } -IDirectDrawSurface7Vtbl DDrawSurface_VTable = +IDirectDrawSurface7Vtbl DirectDrawSurface_Vtable = { Main_DDrawSurface_QueryInterface, Main_DDrawSurface_AddRef, _____ Modified: trunk/reactos/lib/ddraw/main.c --- trunk/reactos/lib/ddraw/main.c 2005-10-23 21:19:34 UTC (rev 18726) +++ trunk/reactos/lib/ddraw/main.c 2005-10-23 21:29:30 UTC (rev 18727) @@ -23,7 +23,7 @@ ZeroMemory(This,sizeof(IDirectDrawImpl)); - This->lpVtbl = &DirectDraw_VTable; + This->lpVtbl = &DirectDraw_Vtable; This->DirectDrawGlobal.dwRefCnt = 1; *pIface = (LPDIRECTDRAW)This; _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 21:19:34 UTC (rev 18726) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 21:29:30 UTC (rev 18727) @@ -11,10 +11,6 @@ #include <ddk/d3dhal.h> #include <ddrawgdi.h> - - - - /******** Main Object ********/ typedef struct @@ -67,8 +63,12 @@ /*********** VTables ************/ -extern IDirectDraw7Vtbl DirectDraw_VTable; -extern IDirectDrawSurface7Vtbl DDrawSurface_VTable; +extern IDirectDraw7Vtbl DirectDraw_Vtable; +extern IDirectDrawSurface7Vtbl DirectDrawSurface_Vtable; +extern IDirectDrawPaletteVtbl DirectDrawPalette_Vtable; +extern IDirectDrawClipperVtbl DirectDrawClipper_Vtable; +extern IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable; +extern IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable; /********* Prototypes **********/

19 years, 2 months

[npwoods] 18726: Notepad: Fixed "Find Up"

by npwoods＠svn.reactos.com

Notepad: Fixed "Find Up" Modified: trunk/reactos/subsys/system/notepad/main.c _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-10-23 21:17:12 UTC (rev 18725) +++ trunk/reactos/subsys/system/notepad/main.c 2005-10-23 21:19:34 UTC (rev 18726) @@ -94,7 +94,7 @@ case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; default: - break; + break; } return 0; } @@ -108,7 +108,7 @@ { BOOL bMatches; int iTargetLength; - + iTargetLength = _tcslen(pFindReplace->lpstrFindWhat); /* Make proper comparison */ @@ -145,8 +145,8 @@ iTargetLength = _tcslen(pFindReplace->lpstrFindWhat); + /* Retrieve the window text */ iTextLength = GetWindowTextLength(Globals.hEdit); - if (iTextLength > 0) { pszText = (LPTSTR) HeapAlloc(GetProcessHeap(), 0, (iTextLength + 1) * sizeof(TCHAR)); @@ -158,25 +158,37 @@ SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM) &dwBegin, (LPARAM) &dwEnd); if (bReplace && ((dwEnd - dwBegin) == iTargetLength)) - { + { if (NOTEPAD_FindTextAt(pFindReplace, pszText, iTextLength, dwBegin)) - { + { SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM) pFindReplace->lpstrReplaceWith); iAdjustment = _tcslen(pFindReplace->lpstrReplaceWith) - (dwEnd - dwBegin); - } - } + } + } - dwPosition = dwEnd; - while(dwPosition < iTextLength) + if (pFindReplace->Flags & FR_DOWN) { - bMatches = NOTEPAD_FindTextAt(pFindReplace, pszText, iTextLength, dwPosition); - if (bMatches) - break; - - if (pFindReplace->Flags & FR_DOWN) + /* Find Down */ + dwPosition = dwEnd; + while(dwPosition < iTextLength) + { + bMatches = NOTEPAD_FindTextAt(pFindReplace, pszText, iTextLength, dwPosition); + if (bMatches) + break; dwPosition++; - else + } + } + else + { + /* Find Up */ + dwPosition = dwBegin; + while(dwPosition > 0) + { dwPosition--; + bMatches = NOTEPAD_FindTextAt(pFindReplace, pszText, iTextLength, dwPosition); + if (bMatches) + break; + } } if (bMatches) @@ -188,18 +200,18 @@ SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); bSuccess = TRUE; } - else - { + else + { /* Can't find target */ if (bShowAlert) - { + { LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, SIZEOF(szResource)); _sntprintf(szText, SIZEOF(szText), szResource, pFindReplace->lpstrFindWhat); LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); MessageBox(Globals.hFindReplaceDlg, szText, szResource, MB_OK); - } + } bSuccess = FALSE; - } + } if (pszText) HeapFree(GetProcessHeap(), 0, pszText); @@ -220,7 +232,7 @@ while (NOTEPAD_FindNext(pFindReplace, TRUE, bShowAlert)) { bShowAlert = FALSE; - } + } } /***********************************************************************

19 years, 2 months

[greatlrd] 18725: implement Main_DirectDraw_GetDisplayMode (not to 100% see the comment)

by greatlrd＠svn.reactos.com

implement Main_DirectDraw_GetDisplayMode (not to 100% see the comment) implement Main_DirectDraw_GetMonitorFrequency but we do not get the freq at return we need exaime the hal instate. Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 21:10:58 UTC (rev 18724) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 21:17:12 UTC (rev 18725) @@ -245,8 +245,52 @@ } HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ - DX_STUB; +{ + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + if (pDDSD == NULL) + { + return DD_FALSE; + } + + pDDSD->dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE | DDSD_WIDTH; + pDDSD->dwHeight = This->DirectDrawGlobal.vmiData.dwDisplayHeight; + pDDSD->dwWidth = This->DirectDrawGlobal.vmiData.dwDisplayWidth; + + /* FIXME Do not use DUMMYUNIONNAME1 some how union lPitch does not see by the compiler + but rest of the union are visable. more header problem ??? + */ + pDDSD->DUMMYUNIONNAME1.lPitch = This->DirectDrawGlobal.vmiData.lDisplayPitch; + + + /* have not check where I should get hold of this info yet + DWORD dwBackBufferCount; + */ + + pDDSD->dwRefreshRate = This->DirectDrawGlobal.dwMonitorFrequency; + + /* have not check where I should get hold of this info yet + DWORD dwAlphaBitDepth; + DWORD dwReserved; + LPVOID lpSurface; + union + { + DDCOLORKEY ddckCKDestOverlay; + DWORD dwEmptyFaceColor; + } + DDCOLORKEY ddckCKDestBlt; + DDCOLORKEY ddckCKSrcOverlay; + DDCOLORKEY ddckCKSrcBlt; + */ + + RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->DirectDrawGlobal.vmiData.dd pfDisplay,sizeof(DDPIXELFORMAT)); + RtlCopyMemory(&pDDSD->ddsCaps,&This->DirectDrawGlobal.ddCaps,sizeof(DDCO RECAPS)); + + /* have not check where I should get hold of this info yet + DWORD dwTextureStage; + */ + + return DD_OK; } @@ -263,7 +307,15 @@ HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) { - DX_STUB; + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + if (freq == NULL) + { + return DD_FALSE; + } + + *freq = This->DirectDrawGlobal.dwMonitorFrequency; + return DD_OK; } HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 21:10:58 UTC (rev 18724) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 21:17:12 UTC (rev 18725) @@ -3,6 +3,7 @@ /********* Includes *********/ + #include <windows.h> #include <stdio.h> #include <ddraw.h>

19 years, 2 months

[navaraf] 18724: Fix compilation.

by navaraf＠svn.reactos.com

Fix compilation. Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/view.c _____ Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/view.c --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/view.c 2005-10-23 19:50:05 UTC (rev 18723) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/view.c 2005-10-23 21:10:58 UTC (rev 18724) @@ -37,7 +37,7 @@ LIST_ENTRY CcInUseCacheViewListHead; PMEMORY_AREA CcCacheViewMemoryArea; -NTSTATUS +NTSTATUS NTAPI MmCreateDataFileSection(PSECTION_OBJECT *SectionObject, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes,

19 years, 2 months

[ekohl] 18723: - Implement ScmrChangeServiceConfigW stub.

by ekohl＠svn.reactos.com

- Implement ScmrChangeServiceConfigW stub. - CreateServiceW calls ScmrCreateServiceW. Modified: trunk/reactos/lib/advapi32/service/scm.c Added: trunk/reactos/subsys/system/services/config.c Modified: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.h Modified: trunk/reactos/subsys/system/services/services.xml _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-10-23 19:24:42 UTC (rev 18722) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-10-23 19:50:05 UTC (rev 18723) @@ -106,26 +106,68 @@ /********************************************************************** * ChangeServiceConfigW * - * @unimplemented + * @implemented */ -BOOL -STDCALL -ChangeServiceConfigW( - SC_HANDLE hService, - DWORD dwServiceType, - DWORD dwStartType, - DWORD dwErrorControl, - LPCWSTR lpBinaryPathName, - LPCWSTR lpLoadOrderGroup, - LPDWORD lpdwTagId, - LPCWSTR lpDependencies, - LPCWSTR lpServiceStartName, - LPCWSTR lpPassword, - LPCWSTR lpDisplayName) +BOOL STDCALL +ChangeServiceConfigW(SC_HANDLE hService, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, + LPCWSTR lpBinaryPathName, + LPCWSTR lpLoadOrderGroup, + LPDWORD lpdwTagId, + LPCWSTR lpDependencies, + LPCWSTR lpServiceStartName, + LPCWSTR lpPassword, + LPCWSTR lpDisplayName) { - DPRINT1("ChangeServiceConfigW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwError; + DWORD dwDependenciesLength = 0; + DWORD dwLength; + LPWSTR lpStr; + + DPRINT1("ChangeServiceConfigW() called\n"); + + /* Calculate the Dependencies length*/ + if (lpDependencies != NULL) + { + lpStr = (LPWSTR)lpDependencies; + while (*lpStr) + { + dwLength = wcslen(lpStr) + 1; + dwDependenciesLength += dwLength; + lpStr = lpStr + dwLength; + } + dwDependenciesLength++; + } + + /* FIXME: Encrypt the password */ + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrChangeServiceConfigW(BindingHandle, + (unsigned int)hService, + dwServiceType, + dwStartType, + dwErrorControl, + (LPWSTR)lpBinaryPathName, + (LPWSTR)lpLoadOrderGroup, + lpdwTagId, + (LPWSTR)lpDependencies, + dwDependenciesLength, + (LPWSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (LPWSTR)lpDisplayName); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrChangeServiceConfigW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; } @@ -243,7 +285,7 @@ /********************************************************************** * CreateServiceW * - * @unimplemented + * @implemented */ SC_HANDLE STDCALL CreateServiceW(SC_HANDLE hSCManager, @@ -262,7 +304,6 @@ { SC_HANDLE hService = NULL; DWORD dwError; - HKEY hEnumKey, hKey; DWORD dwDependenciesLength = 0; DWORD dwLength; LPWSTR lpStr; @@ -284,7 +325,6 @@ /* FIXME: Encrypt the password */ -#if 0 HandleBind(); /* Call to services.exe using RPC */ @@ -299,25 +339,12 @@ (LPWSTR)lpBinaryPathName, (LPWSTR)lpLoadOrderGroup, lpdwTagId, - lpDependencies, + (LPWSTR)lpDependencies, dwDependenciesLength, (LPWSTR)lpServiceStartName, NULL, /* FIXME: lpPassword */ 0, /* FIXME: dwPasswordLength */ (unsigned int *)&hService); -#else - RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services", 0, KEY_ENUMERATE_SUB_KEYS, &hEnumKey); - RegCreateKeyExW(hEnumKey, lpServiceName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); - RegCloseKey(hEnumKey); - if (lpLoadOrderGroup) - RegSetValueExW(hKey, L"Group", 0, REG_SZ, (const BYTE*)lpLoadOrderGroup, (wcslen(lpLoadOrderGroup) + 1) * sizeof(WCHAR)); - RegSetValueExW(hKey, L"ImagePath", 0, REG_EXPAND_SZ, (const BYTE*)lpBinaryPathName, (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); - RegSetValueExW(hKey, L"ErrorControl", 0, REG_DWORD, (const BYTE*)&dwErrorControl, sizeof(dwErrorControl)); - RegSetValueExW(hKey, L"Start", 0, REG_DWORD, (const BYTE*)&dwStartType, sizeof(dwStartType)); - RegSetValueExW(hKey, L"Type", 0, REG_DWORD, (const BYTE*)&dwStartType, sizeof(dwStartType)); - RegCloseKey(hKey); - hService = INVALID_HANDLE_VALUE; dwError = ERROR_SUCCESS; -#endif if (dwError != ERROR_SUCCESS) { DPRINT1("ScmrCreateServiceW() failed (Error %lu)\n", dwError); _____ Added: trunk/reactos/subsys/system/services/config.c --- trunk/reactos/subsys/system/services/config.c 2005-10-23 19:24:42 UTC (rev 18722) +++ trunk/reactos/subsys/system/services/config.c 2005-10-23 19:50:05 UTC (rev 18723) @@ -0,0 +1,103 @@ +/* + * config.c + */ + +/* INCLUDES *****************************************************************/ + +#include "services.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +DWORD +ScmWriteDependencies(HKEY hServiceKey, + LPWSTR lpDependencies, + DWORD dwDependenciesLength) +{ + DWORD dwError = ERROR_SUCCESS; + DWORD dwGroupLength = 0; + DWORD dwServiceLength = 0; + DWORD dwLength; + LPWSTR lpGroupDeps; + LPWSTR lpServiceDeps; + LPWSTR lpSrc; + LPWSTR lpDst; + + if (*lpDependencies == 0) + { + RegDeleteValue(hServiceKey, + L"DependOnService"); + RegDeleteValue(hServiceKey, + L"DependOnGroup"); + } + else + { + lpGroupDeps = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (dwDependenciesLength + 2) * sizeof(WCHAR)); + if (lpGroupDeps == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + lpSrc = lpDependencies; + lpDst = lpGroupDeps; + while (*lpSrc != 0) + { + dwLength = wcslen(lpSrc); + if (*lpSrc == SC_GROUP_IDENTIFIERW) + { + lpSrc++; + dwGroupLength += dwLength; + wcscpy(lpDst, lpSrc); + lpDst = lpDst + dwLength; + } + + lpSrc = lpSrc + dwLength; + } + *lpDst = 0; + lpDst++; + dwGroupLength++; + + lpSrc = lpDependencies; + lpServiceDeps = lpDst; + while (*lpSrc != 0) + { + dwLength = wcslen(lpSrc) + 1; + if (*lpSrc != SC_GROUP_IDENTIFIERW) + { + dwServiceLength += dwLength; + wcscpy(lpDst, lpSrc); + lpDst = lpDst + dwLength; + } + + lpSrc = lpSrc + dwLength; + } + *lpDst = 0; + dwServiceLength++; + + dwError = RegSetValueExW(hServiceKey, + L"DependOnGroup", + 0, + REG_MULTI_SZ, + (LPBYTE)lpGroupDeps, + dwGroupLength * sizeof(WCHAR)); + + if (dwError == ERROR_SUCCESS) + { + dwError = RegSetValueExW(hServiceKey, + L"DependOnService", + 0, + REG_MULTI_SZ, + (LPBYTE)lpServiceDeps, + dwServiceLength * sizeof(WCHAR)); + } + + HeapFree(GetProcessHeap(), 0, lpGroupDeps); + } + + return dwError; +} + +/* EOF */ + _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-10-23 19:24:42 UTC (rev 18722) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-10-23 19:50:05 UTC (rev 18723) @@ -472,25 +472,32 @@ /* Function 11 */ -#if 0 unsigned long -ScmrChangeServiceConfigW([in] handle_t BiningHandle, - [in] SC_HANDLE hService, - [in] DWORD dwServiceType, - [in] DWORD dwStartType, - [in] DWORD dwErrorControl, - [in, string, unique] LPCWSTR lpBinaryPathName, - [in, string, unique] LPCWSTR lpLoadOrderGroup, - [in, out, unique] LPDWORD lpdwTagId, - [in, size_is(dwDependenciesLength), unique] LPCWSTR lpDependencies, - [in] DWORD dwDependenciesLength, - [in, string, unique] LPCWSTR lpServiceStartName, - [in, size_is(dwPasswordLength), unique] LPCWSTR lpPassword, - [in] DWORD dwPasswordLength, - [in, string, unique] LPCWSTR lpDisplayName) +ScmrChangeServiceConfigW(handle_t BiningHandle, + unsigned int hService, + unsigned long dwServiceType, + unsigned long dwStartType, + unsigned long dwErrorControl, + wchar_t *lpBinaryPathName, + wchar_t *lpLoadOrderGroup, + unsigned long *lpdwTagId, /* in, out, unique */ + wchar_t *lpDependencies, + unsigned long dwDependenciesLength, + wchar_t *lpServiceStartName, + wchar_t *lpPassword, + unsigned long dwPasswordLength, + wchar_t *lpDisplayName) { + DPRINT1("ScmrChangeServiceConfigW() called\n"); + DPRINT1("dwServiceType = %lu\n", dwServiceType); + DPRINT1("dwStartType = %lu\n", dwStartType); + DPRINT1("dwErrorControl = %lu\n", dwErrorControl); + DPRINT1("lpBinaryPathName = %S\n", lpBinaryPathName); + DPRINT1("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); + DPRINT1("lpDisplayName = %S\n", lpDisplayName); + + return ERROR_SUCCESS; } -#endif static DWORD @@ -710,9 +717,14 @@ /* FIXME: Write tag */ } + /* Write dependencies */ if (lpDependencies != NULL && *lpDependencies != 0) { - /* FIXME: Write dependencies */ + dwError = ScmWriteDependencies(hServiceKey, + lpDependencies, + dwDependenciesLength); + if (dwError != ERROR_SUCCESS) + goto done; } if (lpPassword != NULL) _____ Modified: trunk/reactos/subsys/system/services/services.h --- trunk/reactos/subsys/system/services/services.h 2005-10-23 19:24:42 UTC (rev 18722) +++ trunk/reactos/subsys/system/services/services.h 2005-10-23 19:50:05 UTC (rev 18723) @@ -32,9 +32,11 @@ } SERVICE, *PSERVICE; -/* services.c */ +/* config.c */ -VOID PrintString(LPCSTR fmt, ...); +DWORD ScmWriteDependencies(HKEY hServiceKey, + LPWSTR lpDependencies, + DWORD dwDependenciesLength); /* database.c */ @@ -54,5 +56,11 @@ VOID ScmStartRpcServer(VOID); +/* services.c */ + +VOID PrintString(LPCSTR fmt, ...); + + + /* EOF */ _____ Modified: trunk/reactos/subsys/system/services/services.xml --- trunk/reactos/subsys/system/services/services.xml 2005-10-23 19:24:42 UTC (rev 18722) +++ trunk/reactos/subsys/system/services/services.xml 2005-10-23 19:50:05 UTC (rev 18723) @@ -10,6 +10,7 @@ <library>user32</library> <library>advapi32</library> <library>rpcrt4</library> + <file>config.c</file> <file>database.c</file> <file>rpcserver.c</file> <file>services.c</file>

19 years, 2 months

[Greatlrd] 18722: first working api is GetCaps for HAL. rember we do not support HEL, and we are missing GdiEntry2 in ros, so it will not working in reactos until gdientry2 are inplace.

by Greatlrd＠svn.reactos.com

first working api is GetCaps for HAL. rember we do not support HEL, and we are missing GdiEntry2 in ros, so it will not working in reactos until gdientry2 are inplace. Modified: trunk/reactos/lib/ddraw/hal/ddraw.c Modified: trunk/reactos/lib/ddraw/main/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-23 19:18:39 UTC (rev 18721) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-23 19:24:42 UTC (rev 18722) @@ -80,18 +80,50 @@ return 1; } - /* fill some extra data */ - This->DirectDrawGlobal.vmiData.dwDisplayWidth = This->Width; - This->DirectDrawGlobal.vmiData.dwDisplayHeight = This->Height; - This->DirectDrawGlobal.vmiData.lDisplayPitch = This->Width * This->Bpp/8; - This->DirectDrawGlobal.vmiData.dwOffscreenAlign = 64; - This->DirectDrawGlobal.vmiData.dwOverlayAlign = 64; - This->DirectDrawGlobal.vmiData.dwTextureAlign = 64; - This->DirectDrawGlobal.vmiData.dwZBufferAlign = 64; - This->DirectDrawGlobal.vmiData.dwAlphaAlign = 64; - //This->DirectDrawGlobal.vmiData.ddpfDisplay; // This has to be filled + /* Copy HalInfo to DirectDrawGlobal */ - This->DirectDrawGlobal.ddCaps = This->HalInfo.ddCaps; + /* have not check where it should go into yet + LPDDHAL_DDCALLBACKS lpDDCallbacks; + LPDDHAL_DDSURFACECALLBACKS lpDDSurfaceCallbacks; + LPDDHAL_DDPALETTECALLBACKS lpDDPaletteCallbacks; + */ + + RtlCopyMemory(&This->DirectDrawGlobal.vmiData,&This->HalInfo.vmiData,siz eof(VIDMEMINFO)); + RtlCopyMemory(&This->DirectDrawGlobal.ddCaps,&This->HalInfo.ddCaps,sizeo f(DDCORECAPS)); + This->DirectDrawGlobal.dwMonitorFrequency = This->HalInfo.dwMonitorFrequency; + + /* have not check where it should go into yet + LPDDHAL_GETDRIVERINFO GetDriverInfo; + */ + + This->DirectDrawGlobal.dwModeIndex = This->HalInfo.dwModeIndex; + + /* have not check where it should go into yet + LPDWORD lpdwFourCC; + */ + + This->DirectDrawGlobal.dwNumModes = This->HalInfo.dwNumModes; + This->DirectDrawGlobal.lpModeInfo = This->HalInfo.lpModeInfo; + + /* have not check where it should go into yet + DWORD dwFlags; + */ + + /* Unsure which of these two for lpPDevice + This->DirectDrawGlobal.dwPDevice = This->HalInfo.lpPDevice; + This->lpDriverHandle = This->HalInfo.lpPDevice; + */ + + This->DirectDrawGlobal.hInstance = This->HalInfo.hInstance; + + /* have not check where it should go into yet + ULONG_PTR lpD3DGlobalDriverData; + ULONG_PTR lpD3DHALCallbacks; + LPDDHAL_DDEXEBUFCALLBACKS lpDDExeBufCallbacks; + */ + + + This->DirectDrawGlobal.lpDDCBtmp->HALDD = This->DirectDrawGlobal.lpDDCBtmp->cbDDCallbacks; This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface = This->DirectDrawGlobal.lpDDCBtmp->cbDDSurfaceCallbacks; This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf = This->DirectDrawGlobal.lpDDCBtmp->cbDDExeBufCallbacks; _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 19:18:39 UTC (rev 18721) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 19:24:42 UTC (rev 18722) @@ -223,7 +223,25 @@ HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) { - DX_STUB; + DWORD status = DD_FALSE; + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + if (pDriverCaps != NULL) + { + RtlCopyMemory(pDriverCaps,&This->DirectDrawGlobal.ddCaps,sizeof(DDCORECA PS)); + status = DD_OK; + } + + if (pHELCaps != NULL) + { + RtlCopyMemory(pDriverCaps,&This->DirectDrawGlobal.ddHELCaps,sizeof(DDCOR ECAPS)); + status = DD_OK; + } + + /* Both caps mixed ?? */ + /* DDCORECAPS ddBothCaps; */ + + return status; } HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD)

19 years, 2 months

[greatlrd] 18721: adding #define DD_FALSE

by greatlrd＠svn.reactos.com

adding #define DD_FALSE Modified: trunk/reactos/w32api/include/ddraw.h _____ Modified: trunk/reactos/w32api/include/ddraw.h --- trunk/reactos/w32api/include/ddraw.h 2005-10-23 18:54:23 UTC (rev 18720) +++ trunk/reactos/w32api/include/ddraw.h 2005-10-23 19:18:39 UTC (rev 18721) @@ -97,7 +97,8 @@ #define DDENUMRET_CANCEL 0 #define DDENUMRET_OK 1 -#define DD_OK 0 +#define DD_OK S_OK +#define DD_FALSE S_FALSE #define _FACDD 0x876

19 years, 2 months

[gvg] 18720: SVN maintenance

by gvg＠svn.reactos.com

SVN maintenance Property changes on: trunk/rosapps/cmdutils ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/cmdutils/comp ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/cmdutils/find ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/cmdutils/mode ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/cmdutils/more ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/cmdutils/sort ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/cmdutils/tee ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/cmdutils/touch ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/cmdutils/y ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/demos/ddraw ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/demos/maze ___________________________________________________________________ Name: svn:ignore - *.exe *.sym *.coff *.d *.o *.a *.map + GNUmakefile Property changes on: trunk/rosapps/devutils/gdb2 ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/devutils/genguid ___________________________________________________________________ Name: svn:ignore - *.exe *.o *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map *.a + GNUmakefile Property changes on: trunk/rosapps/devutils/zoomin ___________________________________________________________________ Name: svn:ignore - *.exe *.o *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map *.a Debug Release + GNUmakefile Property changes on: trunk/rosapps/dflat32 ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/games/solitaire ___________________________________________________________________ Name: svn:ignore - *.coff *.o *.d *.a *.sym *.map *.exe *.a + GNUmakefile Property changes on: trunk/rosapps/games/winemine ___________________________________________________________________ Name: svn:ignore - *.o *.d *.exe *.coff *.sym *.map *.a + GNUmakefile Property changes on: trunk/rosapps/mc ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/net/ncftp ___________________________________________________________________ Name: svn:ignore - Users *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/net/netreg ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/net/niclist ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/notevil ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/packmgr/cmd-line ___________________________________________________________________ Name: svn:ignore - *.d *.a *.o *.dll *.exe *.coff *.map + GNUmakefile Property changes on: trunk/rosapps/packmgr/gui ___________________________________________________________________ Name: svn:ignore - *.d *.a *.o *.dll *.exe *.coff *.map logfile.html + GNUmakefile Property changes on: trunk/rosapps/packmgr/lib ___________________________________________________________________ Name: svn:ignore - *.d *.a *.o *.dll *.exe *.coff *.map + GNUmakefile Property changes on: trunk/rosapps/sysutils/ctm ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/sysutils/kill ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/sysutils/lsdd ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/sysutils/man ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/sysutils/pedump ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/sysutils/regexpl ___________________________________________________________________ Name: svn:ignore - *.mak *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/sysutils/shutdown ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/rosapps/sysutils/tcat ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/sysutils/tlist ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile Property changes on: trunk/rosapps/templates/dialog ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map + GNUmakefile

19 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
...
74
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 October 2005