Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tretiakov] 21493: [AUDIT] \trunk\reactos\base\applications\testsets\loadlib (unlocked) Tests are clean.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 14:11:50 2006 New Revision: 21493 URL: http://svn.reactos.ru/svn/reactos?rev=21493&view=rev Log: [AUDIT] \trunk\reactos\base\applications\testsets\loadlib (unlocked) Tests are clean. Modified: trunk/reactos/base/applications/testsets/loadlib/loadlib.c (props changed) trunk/reactos/base/applications/testsets/loadlib/loadlib.h (props changed) Propchange: trunk/reactos/base/applications/testsets/loadlib/loadlib.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/testsets/loadlib/loadlib.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 21492: [AUDIT] \trunk\reactos\base\applications\testsets\msvcrt\fileio (unlocked) Tests are clean.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 14:11:18 2006 New Revision: 21492 URL: http://svn.reactos.ru/svn/reactos?rev=21492&view=rev Log: [AUDIT] \trunk\reactos\base\applications\testsets\msvcrt\fileio (unlocked) Tests are clean. Modified: trunk/reactos/base/applications/testsets/msvcrt/fileio/_tfileio.c (props changed) trunk/reactos/base/applications/testsets/msvcrt/fileio/fileio.c (props changed) trunk/reactos/base/applications/testsets/msvcrt/fileio/main.c (props changed) trunk/reactos/base/applications/testsets/msvcrt/fileio/main.h (props changed) trunk/reactos/base/applications/testsets/msvcrt/fileio/wfileio.c (props changed) Propchange: trunk/reactos/base/applications/testsets/msvcrt/fileio/_tfileio.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/testsets/msvcrt/fileio/fileio.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/testsets/msvcrt/fileio/main.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/testsets/msvcrt/fileio/main.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/testsets/msvcrt/fileio/wfileio.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 21491: [AUDIT] \trunk\reactos\base\applications\network\roshttpd (unlocked) Obviously clean. Has nothing to do with reverse engeneering. Written by Casper.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 14:10:34 2006 New Revision: 21491 URL: http://svn.reactos.ru/svn/reactos?rev=21491&view=rev Log: [AUDIT] \trunk\reactos\base\applications\network\roshttpd (unlocked) Obviously clean. Has nothing to do with reverse engeneering. Written by Casper. Modified: trunk/reactos/base/applications/network/roshttpd/common/list.cpp (props changed) trunk/reactos/base/applications/network/roshttpd/common/roshttpd.rc (props changed) trunk/reactos/base/applications/network/roshttpd/common/socket.cpp (props changed) trunk/reactos/base/applications/network/roshttpd/common/thread.cpp (props changed) trunk/reactos/base/applications/network/roshttpd/config.cpp (props changed) trunk/reactos/base/applications/network/roshttpd/error.cpp (props changed) trunk/reactos/base/applications/network/roshttpd/http.cpp (props changed) trunk/reactos/base/applications/network/roshttpd/httpd.cpp (props changed) trunk/reactos/base/applications/network/roshttpd/include/config.h (props changed) trunk/reactos/base/applications/network/roshttpd/include/debug.h (props changed) trunk/reactos/base/applications/network/roshttpd/include/error.h (props changed) trunk/reactos/base/applications/network/roshttpd/include/http.h (props changed) trunk/reactos/base/applications/network/roshttpd/include/httpd.h (props changed) trunk/reactos/base/applications/network/roshttpd/include/iterator.h (props changed) trunk/reactos/base/applications/network/roshttpd/include/list.h (props changed) trunk/reactos/base/applications/network/roshttpd/include/socket.h (props changed) trunk/reactos/base/applications/network/roshttpd/include/thread.h (props changed) trunk/reactos/base/applications/network/roshttpd/roshttpd.cpp (props changed) Propchange: trunk/reactos/base/applications/network/roshttpd/common/list.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/common/roshttpd.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/common/socket.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/common/thread.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/config.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/error.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/http.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/httpd.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/include/config.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/include/debug.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/include/error.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/include/http.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/include/httpd.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/include/iterator.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/include/list.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/include/socket.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/include/thread.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/roshttpd/roshttpd.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 21490: [AUDIT] \trunk\reactos\base\applications\network\ftp (Unlocked) 3rd party code. Copyright (c) 1985 Regents of the University of California.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 14:09:49 2006 New Revision: 21490 URL: http://svn.reactos.ru/svn/reactos?rev=21490&view=rev Log: [AUDIT] \trunk\reactos\base\applications\network\ftp (Unlocked) 3rd party code. Copyright (c) 1985 Regents of the University of California. Modified: trunk/reactos/base/applications/network/ftp/cmds.c (props changed) trunk/reactos/base/applications/network/ftp/cmdtab.c (props changed) trunk/reactos/base/applications/network/ftp/domacro.c (props changed) trunk/reactos/base/applications/network/ftp/fake.c (props changed) trunk/reactos/base/applications/network/ftp/fake.h (props changed) trunk/reactos/base/applications/network/ftp/ftp.c (props changed) trunk/reactos/base/applications/network/ftp/ftp_var.h (props changed) trunk/reactos/base/applications/network/ftp/main.c (props changed) trunk/reactos/base/applications/network/ftp/pathnames.h (props changed) trunk/reactos/base/applications/network/ftp/prototypes.h (props changed) trunk/reactos/base/applications/network/ftp/ruserpass.c (props changed) Propchange: trunk/reactos/base/applications/network/ftp/cmds.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/cmdtab.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/domacro.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/fake.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/fake.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/ftp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/ftp_var.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/main.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/pathnames.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/prototypes.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/network/ftp/ruserpass.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 21489: [AUDIT] \trunk\reactos\base\applications\games\winemine (Unlocked) Wine code.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 14:08:52 2006 New Revision: 21489 URL: http://svn.reactos.ru/svn/reactos?rev=21489&view=rev Log: [AUDIT] \trunk\reactos\base\applications\games\winemine (Unlocked) Wine code. Modified: trunk/reactos/base/applications/games/winemine/README (props changed) trunk/reactos/base/applications/games/winemine/dialog.c (props changed) trunk/reactos/base/applications/games/winemine/dialog.h (props changed) trunk/reactos/base/applications/games/winemine/main.c (props changed) trunk/reactos/base/applications/games/winemine/main.h (props changed) trunk/reactos/base/applications/games/winemine/winemine.rc (props changed) Propchange: trunk/reactos/base/applications/games/winemine/README ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/winemine/dialog.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/winemine/dialog.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/winemine/main.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/winemine/main.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/winemine/winemine.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 21488: [AUDIT] \trunk\reactos\base\applications\calc (Unlocked) Wine code.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 14:08:14 2006 New Revision: 21488 URL: http://svn.reactos.ru/svn/reactos?rev=21488&view=rev Log: [AUDIT] \trunk\reactos\base\applications\calc (Unlocked) Wine code. Modified: trunk/reactos/base/applications/calc/calculator.ico (props changed) trunk/reactos/base/applications/calc/dialog.c (props changed) trunk/reactos/base/applications/calc/dialog.h (props changed) trunk/reactos/base/applications/calc/resource.h (props changed) trunk/reactos/base/applications/calc/stats.c (props changed) trunk/reactos/base/applications/calc/stats.h (props changed) trunk/reactos/base/applications/calc/winecalc.c (props changed) trunk/reactos/base/applications/calc/winecalc.h (props changed) Propchange: trunk/reactos/base/applications/calc/calculator.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/calc/dialog.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/calc/dialog.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/calc/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/calc/stats.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/calc/stats.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/calc/winecalc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/calc/winecalc.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 21487: [AUDIT] \trunk\reactos\base\applications\games\solitaire (Unlocked) Obviously clean. Has nothing to do with reverse engeneering. 3rd party code. Copyright J Brown 2001.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: tretiakov Date: Fri Apr 7 14:07:27 2006 New Revision: 21487 URL: http://svn.reactos.ru/svn/reactos?rev=21487&view=rev Log: [AUDIT] \trunk\reactos\base\applications\games\solitaire (Unlocked) Obviously clean. Has nothing to do with reverse engeneering. 3rd party code. Copyright J Brown 2001. Modified: trunk/reactos/base/applications/games/solitaire/ReadMe.txt (props changed) trunk/reactos/base/applications/games/solitaire/resource.h (props changed) trunk/reactos/base/applications/games/solitaire/solcreate.cpp (props changed) trunk/reactos/base/applications/games/solitaire/solgame.cpp (props changed) trunk/reactos/base/applications/games/solitaire/solitaire.cpp (props changed) trunk/reactos/base/applications/games/solitaire/solitaire.h (props changed) trunk/reactos/base/applications/games/solitaire/solitaire.ico (props changed) Propchange: trunk/reactos/base/applications/games/solitaire/ReadMe.txt ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/solcreate.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/solgame.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/solitaire.cpp ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/solitaire.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/games/solitaire/solitaire.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21486: patch from w3seek : compile with gcc4.1 again
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Fri Apr 7 12:56:12 2006 New Revision: 21486 URL: http://svn.reactos.ru/svn/reactos?rev=21486&view=rev Log: patch from w3seek : compile with gcc4.1 again Modified: trunk/reactos/base/applications/wordpad/dialogs.c Modified: trunk/reactos/base/applications/wordpad/dialogs.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/wordpad/d… ============================================================================== --- trunk/reactos/base/applications/wordpad/dialogs.c (original) +++ trunk/reactos/base/applications/wordpad/dialogs.c Fri Apr 7 12:56:12 2006 @@ -24,8 +24,8 @@ hInstance, i)) { - ListBox_AddString(hList, - lpDocType); + (void)ListBox_AddString(hList, + lpDocType); LocalFree((HLOCAL)lpDocType); } }

1 0

[greatlrd] 21485: 1. Clean up Hal_DirectDraw_CreateSurface 2. Start implemenr createsurface overlay base on Steffen Schulze code.
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Fri Apr 7 12:12:13 2006 New Revision: 21485 URL: http://svn.reactos.ru/svn/reactos?rev=21485&view=rev Log: 1. Clean up Hal_DirectDraw_CreateSurface 2. Start implemenr createsurface overlay base on Steffen Schulze code. 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 12:12:13 2006 @@ -13,286 +13,263 @@ HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { -// UINT i; - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - DDHAL_CREATESURFACEDATA mDdCreateSurface; + UINT i; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DDHAL_CREATESURFACEDATA mDdCreateSurface; DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - - /* create primare surface now */ - if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - memset(&This->mddsdPrimary, 0, sizeof(DDSURFACEDESC)); - This->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); - This->mddsdPrimary.dwFlags = pDDSD->dwFlags; - This->mddsdPrimary.ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; + mDdCreateSurface.lpDD = &This->mDDrawGlobal; + mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + + /* create primare surface now */ + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + memset(&This->mddsdPrimary, 0, sizeof(DDSURFACEDESC)); + This->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + This->mddsdPrimary.dwFlags = pDDSD->dwFlags; + This->mddsdPrimary.ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; // pDDSD; + mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; // pDDSD; if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - 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(); + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + 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(); - // FIXME Check the flags if we shall create a primaresurface for overlay or something else - This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA|DDRAWISURF_HASDC; - This->mPrimaryLocal.ddsCaps.dwCaps = This->mddsdPrimary.ddsCaps.dwCaps; - This->mpPrimaryLocals[0] = &This->mPrimaryLocal; - - mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary;//pDDSD; - mDdCreateSurface.lplpSList = This->mpPrimaryLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; //ppSurfaces; - if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) - { - DX_STUB; - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - DX_STUB; - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - { - DX_STUB; - } - else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) - { - DX_STUB; - } - - // return DDERR_INVALIDSURFACETYPE; - - - - /* - * - * - * - */ - - /* create overlay surface now */ - - /* - memset(&This->mddsdOverlay, 0, 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; - - - //DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdOverlay; // pDDSD; + /* + 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 + */ + + This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + This->mPrimaryLocal.ddsCaps.dwCaps = This->mddsdPrimary.ddsCaps.dwCaps; + This->mpPrimaryLocals[0] = &This->mPrimaryLocal; + + mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; + mDdCreateSurface.lplpSList = This->mpPrimaryLocals; + mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; + + if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } + + return DD_OK; + + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) + { + memset(&This->mddsdOverlay, 0, 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; - } - + 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 = This->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; - 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; - } - - } - - - // DDHAL_CREATESURFACEDATA mDdCreateSurface; - 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; - } - - //mSrcRect.w = mddsdOverlay.dwWidth; - //mSrcRect.h = mddsdOverlay.dwHeight; - //__alignBounds(); - - - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; - mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = This->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; - } -*/ - - DDHAL_BLTDATA mDdBlt; - mDdBlt.lpDDDestSurface = This->mpPrimaryLocals[0]; - - if (!DdResetVisrgn(This->mpPrimaryLocals[0], NULL)) - { - // derr(L"DirectDrawImpl[%08x]::_clear DdResetVisrgn failed", this); - return DDERR_NOGDI; - } - - memset(&mDdBlt, 0, sizeof(DDHAL_BLTDATA)); - memset(&mDdBlt.bltFX, 0, sizeof(DDBLTFX)); - mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); - - mDdBlt.lpDD = &This->mDDrawGlobal; - mDdBlt.Blt = This->mCallbacks.HALDDSurface.Blt; - mDdBlt.lpDDDestSurface = This->mpPrimaryLocals[0]; - - This->mpPrimaryLocals[0]->hDC = (ULONG_PTR)GetDC(This->CooperativeHWND); - mDdBlt.rDest.top = 50; - mDdBlt.rDest.bottom = 100; - mDdBlt.rDest.left = 0; - mDdBlt.rDest.right = 100; - mDdBlt.lpDDSrcSurface = NULL; - mDdBlt.IsClipped = FALSE; - mDdBlt.bltFX.dwFillColor = 0xFFFF00; - mDdBlt.dwFlags = DDBLT_COLORFILL | DDBLT_WAIT; - - if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) - { - return DDHAL_DRIVER_HANDLED; - } - - - - if (mDdBlt.ddRVal!=DD_OK) - { - return mDdBlt.ddRVal; - } - - return DD_OK; + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) + { + DX_STUB; + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + { + DX_STUB; + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + DX_STUB; + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) + { + DX_STUB; + } + + return DDERR_INVALIDSURFACETYPE; } HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { DX_STUB; + // DDHAL_BLTDATA mDdBlt; + // mDdBlt.lpDDDestSurface = This->mpPrimaryLocals[0]; + + // if (!DdResetVisrgn(This->mpPrimaryLocals[0], NULL)) + // { + // // derr(L"DirectDrawImpl[%08x]::_clear DdResetVisrgn failed", this); + // return DDERR_NOGDI; + // } + + // memset(&mDdBlt, 0, sizeof(DDHAL_BLTDATA)); + // memset(&mDdBlt.bltFX, 0, sizeof(DDBLTFX)); + // mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); + + // mDdBlt.lpDD = &This->mDDrawGlobal; + // mDdBlt.Blt = This->mCallbacks.HALDDSurface.Blt; + // mDdBlt.lpDDDestSurface = This->mpPrimaryLocals[0]; + // + // This->mpPrimaryLocals[0]->hDC = (ULONG_PTR)GetDC(This->CooperativeHWND); + // mDdBlt.rDest.top = 50; + // mDdBlt.rDest.bottom = 100; + // mDdBlt.rDest.left = 0; + // mDdBlt.rDest.right = 100; + // mDdBlt.lpDDSrcSurface = NULL; + // mDdBlt.IsClipped = FALSE; + // mDdBlt.bltFX.dwFillColor = 0xFFFF00; + // mDdBlt.dwFlags = DDBLT_COLORFILL | DDBLT_WAIT; + + // if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) + //{ + // return DDHAL_DRIVER_HANDLED; + // } + + // + + // if (mDdBlt.ddRVal!=DD_OK) + //{ + // return mDdBlt.ddRVal; + // } + + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src;

1 0

[greatlrd] 21484: setup almost all Createsurface for primar right it is very few thin left todo
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Fri Apr 7 10:45:25 2006 New Revision: 21484 URL: http://svn.reactos.ru/svn/reactos?rev=21484&view=rev Log: setup almost all Createsurface for primar right it is very few thin left todo 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 10:45:25 2006 @@ -13,97 +13,91 @@ HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { - UINT i; - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - /* create primare surface now */ - - memset(&This->mddsdPrimary, 0, sizeof(DDSURFACEDESC)); - This->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); - This->mddsdPrimary.dwFlags = DDSD_CAPS; - This->mddsdPrimary.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_VIDEOMEMORY | DDSCAPS_VISIBLE; - - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; // pDDSD; - - - if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - // derr(L"DirectDrawImpl[%08x]::__createPrimary Cannot create primary [%08x]", this, rv); - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - 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(); - This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - This->mPrimaryLocal.ddsCaps.dwCaps = This->mddsdPrimary.ddsCaps.dwCaps; - - This->mpPrimaryLocals[0] = &This->mPrimaryLocal; - - DDHAL_CREATESURFACEDATA mDdCreateSurface; - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary;//pDDSD; - mDdCreateSurface.lplpSList = This->mpPrimaryLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; //ppSurfaces; - - if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - // -- Setup Clipper --------------------------------------------------------- - memset(&This->mPrimaryClipperGlobal, 0, sizeof(DDRAWI_DDRAWCLIPPER_GBL)); - This->mPrimaryClipperGlobal.dwFlags = DDRAWICLIP_ISINITIALIZED; - This->mPrimaryClipperGlobal.dwProcessId = GetCurrentProcessId(); - //mPrimaryClipperGlobal.hWnd = (ULONG_PTR)hwnd; - This->mPrimaryClipperGlobal.hWnd = (ULONG_PTR)GetDesktopWindow(); - This->mPrimaryClipperGlobal.lpDD = &This->mDDrawGlobal; - This->mPrimaryClipperGlobal.lpStaticClipList = NULL; - - memset(&This->mPrimaryClipperLocal, 0, sizeof(DDRAWI_DDRAWCLIPPER_LCL)); - This->mPrimaryClipperLocal.lpGbl = &This->mPrimaryClipperGlobal; - - //memset(&mPrimaryClipperInterface, 0, sizeof(DDRAWI_DDRAWCLIPPER_INT)); - //mPrimaryClipperInterface.lpLcl = &mPrimaryClipperLocal; - //mPrimaryClipperInterface.dwIntRefCnt = 1; - //mPrimaryClipperInterface.lpLink = null; - //mPrimaryClipperInterface.lpVtbl = null; - - This->mPrimaryLocal.lpDDClipper = &This->mPrimaryClipperLocal; - //mPrimaryMore.lpDDIClipper = &mPrimaryClipperInterface; - - //mDdBlt.lpDDDestSurface = mpPrimaryLocals[0]; - - - /* create primare surface is down now */ +// UINT i; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DDHAL_CREATESURFACEDATA mDdCreateSurface; + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + + + mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + + mDdCreateSurface.lpDD = &This->mDDrawGlobal; + mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + + /* create primare surface now */ + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + memset(&This->mddsdPrimary, 0, sizeof(DDSURFACEDESC)); + This->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + This->mddsdPrimary.dwFlags = pDDSD->dwFlags; + This->mddsdPrimary.ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; + mDdCanCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary; // pDDSD; + + if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + 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(); + + // FIXME Check the flags if we shall create a primaresurface for overlay or something else + This->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA|DDRAWISURF_HASDC; + This->mPrimaryLocal.ddsCaps.dwCaps = This->mddsdPrimary.ddsCaps.dwCaps; + This->mpPrimaryLocals[0] = &This->mPrimaryLocal; + + mDdCreateSurface.lpDDSurfaceDesc = &This->mddsdPrimary;//pDDSD; + mDdCreateSurface.lplpSList = This->mpPrimaryLocals; //cSurfaces; + mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; //ppSurfaces; + if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) + { + DX_STUB; + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + { + DX_STUB; + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + DX_STUB; + } + else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) + { + DX_STUB; + } + + // return DDERR_INVALIDSURFACETYPE; + /* @@ -114,6 +108,7 @@ /* create overlay surface now */ + /* memset(&This->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); This->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); This->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; @@ -185,12 +180,7 @@ UINT j = (i + 1) % cSurfaces; - /*if (!mHALInfo.lpDDSurfaceCallbacks->AddAttachedSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); - return DD_FALSE; - }*/ - + if (!DdAttachSurface(This->mpOverlayLocals[i], This->mpOverlayLocals[j])) { // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); @@ -230,11 +220,7 @@ mDdUpdateOverlay.lpDDSrcSurface = This->mpOverlayLocals[0];//pDDSurface; mDdUpdateOverlay.dwFlags = DDOVER_SHOW; - /* if (flags & DDOVER_DDFX) - mDdUpdateOverlay.overlayFX = *pFx; - copyRect(&mDdUpdateOverlay.rDest, pdst); - copyRect(&mDdUpdateOverlay.rSrc, psrc); -*/ + mDdUpdateOverlay.rDest.top = 0; mDdUpdateOverlay.rDest.left = 0; @@ -259,6 +245,46 @@ { return mDdUpdateOverlay.ddRVal; } +*/ + + DDHAL_BLTDATA mDdBlt; + mDdBlt.lpDDDestSurface = This->mpPrimaryLocals[0]; + + if (!DdResetVisrgn(This->mpPrimaryLocals[0], NULL)) + { + // derr(L"DirectDrawImpl[%08x]::_clear DdResetVisrgn failed", this); + return DDERR_NOGDI; + } + + memset(&mDdBlt, 0, sizeof(DDHAL_BLTDATA)); + memset(&mDdBlt.bltFX, 0, sizeof(DDBLTFX)); + mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); + + mDdBlt.lpDD = &This->mDDrawGlobal; + mDdBlt.Blt = This->mCallbacks.HALDDSurface.Blt; + mDdBlt.lpDDDestSurface = This->mpPrimaryLocals[0]; + + This->mpPrimaryLocals[0]->hDC = (ULONG_PTR)GetDC(This->CooperativeHWND); + mDdBlt.rDest.top = 50; + mDdBlt.rDest.bottom = 100; + mDdBlt.rDest.left = 0; + mDdBlt.rDest.right = 100; + mDdBlt.lpDDSrcSurface = NULL; + mDdBlt.IsClipped = FALSE; + mDdBlt.bltFX.dwFillColor = 0xFFFF00; + mDdBlt.dwFlags = DDBLT_COLORFILL | DDBLT_WAIT; + + if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) + { + return DDHAL_DRIVER_HANDLED; + } + + + + if (mDdBlt.ddRVal!=DD_OK) + { + return mDdBlt.ddRVal; + } return DD_OK; } 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 10:45:25 2006 @@ -136,6 +136,9 @@ // set the data This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); + + This->CooperativeHWND = hwnd; + /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags 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 10:45:25 2006 @@ -67,6 +67,7 @@ DDRAWI_DIRECTDRAW_LCL ExclusiveOwner; DWORD cooperative_level; + HWND CooperativeHWND; BOOL InitializeDraw;

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