Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 21523: [AUDIT] ntoskrnl/io/efi.c: - Contains only function prototypes which are clean apriori
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: fireball Date: Sun Apr 9 15:42:34 2006 New Revision: 21523 URL: http://svn.reactos.ru/svn/reactos?rev=21523&view=rev Log: [AUDIT] ntoskrnl/io/efi.c: - Contains only function prototypes which are clean apriori Modified: trunk/reactos/ntoskrnl/io/efi.c (props changed) Propchange: trunk/reactos/ntoskrnl/io/efi.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 21522: [AUDIT] ntoskrnl/io/pnpmgr.c: - Unlock the file, since auditing documentation has been commited and only parts of the file might be considered dirty - Auditing of this file is in progress, however it's changed to per-function mode - No function 100% confirmed to be dirty in this file!
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: fireball Date: Sun Apr 9 15:39:39 2006 New Revision: 21522 URL: http://svn.reactos.ru/svn/reactos?rev=21522&view=rev Log: [AUDIT] ntoskrnl/io/pnpmgr.c: - Unlock the file, since auditing documentation has been commited and only parts of the file might be considered dirty - Auditing of this file is in progress, however it's changed to per-function mode - No function 100% confirmed to be dirty in this file! Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c (props changed) Propchange: trunk/reactos/ntoskrnl/io/pnpmgr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 21521: - Add documentation for ntoskrnl/io/pnpmgr.c
by aleksey＠studiocerebral.com 09 Apr '06

09 Apr '06

Author: fireball Date: Sun Apr 9 15:34:21 2006 New Revision: 21521 URL: http://svn.reactos.ru/svn/reactos?rev=21521&view=rev Log: - Add documentation for ntoskrnl/io/pnpmgr.c Added: trunk/documentation/audit/ntoskrnl/ trunk/documentation/audit/ntoskrnl/io/ trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt Added: trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt URL: http://svn.reactos.ru/svn/reactos/trunk/documentation/audit/ntoskrnl/io/pnp… ============================================================================== --- trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt (added) +++ trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt Sun Apr 9 15:34:21 2006 @@ -1,0 +1,98 @@ +Audit: ntoskrnl / io / pnpmgr.c +References: + Books listed in reactos/media/doc/Books.txt + other stuff in the internet (hpoussin may add more info sources here) + +Audit Result: In progress + +Functions: + +IopGetDeviceNode() +Result: Clean (<5 lines) + +IopQueryDeviceCapabilities() +Info: Google reports only references to ReactOS's source code, no results in msdn search too +Result: Author needs to be contacted, however function implementation seems to be rather small and has a few comments + +IoInvalidateDeviceRelations() +Result: Clean (<5 lines) + +IoGetDeviceProperty() +Info: This function is documented in lots of places (Google tells results: OSR, msdn, etc). +Result: Clean (has public documentation) + +IoInvalidateDeviceState() +Result: Unimplemented -> Clean + +IoOpenDeviceRegistryKey() +Result: Public function, documented -> Clean + +IoRequestDeviceEject() +Result: Unimplemented -> Clean + +IopGetSystemPowerDeviceObject() +Result: <5 lines of actual code -> Clean + +IopGetBusTypeGuidIndex() +Info: Only ReactOS source code got in results of Google search. Function is heavily commented. There is a goto usage, however it's obvious and doesn't seem to come + from reverse engineering. +Result: ? + +IopCreateDeviceNode() / IopFreeDeviceNode() +Info: Google finds only ReactOS results. I haven't checked other information sources +Result: ? + +IopInitiatePnpIrp() +Info: Google finds only ReactOS results. I haven't checked other information sources +Result: ? + +IopTraverseDeviceTreeNode() / IopTraverseDeviceTree() +Info: Google finds only ReactOS results. I haven't checked other information sources +Result: ? + +IopCreateDeviceKeyPath() +Info: Google finds only ReactOS results. I haven't checked other information sources +Result: ? afaik Hartmut Birr is the author, and he always claimed he never uses reverse engineering methods + +IopSetDeviceInstanceData() +Info: Google finds only ReactOS results. I haven't checked other information sources +Result: ? + +IopAssignDeviceResources() +Info: Google finds only ReactOS results. I haven't checked other information sources. This function seems to be absolutely ReactOS-specific (especially the irq-hacks/etc) +Result: Probably Clean? + +IopGetParentIdPrefix() +Info: Google finds only ReactOS results. I haven't checked other information sources +Result: ? + +IopActionInterrogateDeviceStack() +Info: Google finds only ReactOS results. I haven't checked other information sources +Result: ? + +IopActionConfigureChildServices() / IopActionInitChildServices() +Info: Google finds only ReactOS results. I haven't checked other information sources +Result: ? + +IopActionInitAllServices() +Result: Clean (<5 LOC) + +IopActionInitBootServices() +Result: Clean (<5 LOC) + +IopInitializePnpServices() +Result: Clean (<5 LOC) + +IopInvalidateDeviceRelations() +Info: hpoussin worked on it, and also I remember there are sources of documentation for it +Result: probably Clean + +IopSetRootDeviceInstanceData() +Result: Clean, because it's unimplemented + +PnpInit() +Info: Documentation sources should be located +Result: ? Author(s) should be contacted + +PnpInit2() +Result: Clean (<5 LOC)

1 0

[greatlrd] 21520: parly implement surface_Lock it does not work yet but here is the code almost complete for HAL
by aleksey＠studiocerebral.com 08 Apr '06

08 Apr '06

Author: greatlrd Date: Sun Apr 9 03:01:04 2006 New Revision: 21520 URL: http://svn.reactos.ru/svn/reactos?rev=21520&view=rev Log: parly implement surface_Lock it does not work yet but here is the code almost complete for HAL Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Sun Apr 9 03:01:04 2006 @@ -315,7 +315,37 @@ HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event) { - DX_STUB; + + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + + DDHAL_LOCKDATA Lock; + + if (prect!=NULL) + { + Lock.bHasRect = TRUE; + memcpy(&Lock.rArea,prect,sizeof(RECTL)); + } + else + { + Lock.bHasRect = FALSE; + } + + Lock.ddRVal = DDERR_NOTPALETTIZED; + Lock.Lock = This->owner->mCallbacks.HALDDSurface.Lock; + Lock.dwFlags = flags; + Lock.lpDDSurface = This->Surf->mpPrimaryLocals[0]; + Lock.lpDD = &This->owner->mDDrawGlobal; + // FIXME lpSurfData + //Lock.lpSurfData = + + if (This->owner->mCallbacks.HALDDSurface.Lock(&Lock)!= DDHAL_DRIVER_NOTHANDLED) + { + return Lock.ddRVal; + } + // FIXME LPDDSURFACEDESC2 + + return DD_OK; } HRESULT Hal_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) { Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sun Apr 9 03:01:04 2006 @@ -81,6 +81,11 @@ DX_WINDBG_trace(); IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if (event != NULL) + { + return DDERR_INVALIDPARAMS; + } if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_LOCK) { Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Apr 9 03:01:04 2006 @@ -9,6 +9,22 @@ #include <ddrawi.h> #include <d3dhal.h> #include <ddrawgdi.h> + + +/* this sturct are not longer in DDK + I did recrate it by looking diffent betwin DD_xx struct and _DDHAL strucrt + only diffent I found was the global pointer have been change from LPDDRAWI_DDRAWSURFACE_GBL + to DD_DIRECTDRAW_GLOBAL +*/ + +typedef struct _DDHAL_MAPMEMORYDATA +{ + LPDDRAWI_DDRAWSURFACE_GBL lpDD; + BOOL bMap; + HANDLE hProcess; + FLATPTR fpProcess; + HRESULT ddRVal; +} DDHAL_MAPMEMORYDATA; /* own macro to alloc memmory */ #define DxHeapMemAlloc(m) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, m)

1 0

[greatlrd] 21519: Adding Hel_DDrawSurface and Hal_DDrawSurface stub so it being more easy to implement some api
by aleksey＠studiocerebral.com 08 Apr '06

08 Apr '06

Author: greatlrd Date: Sun Apr 9 01:05:49 2006 New Revision: 21519 URL: http://svn.reactos.ru/svn/reactos?rev=21519&view=rev Log: Adding Hel_DDrawSurface and Hal_DDrawSurface stub so it being more easy to implement some api Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surfa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Sun Apr 9 01:05:49 2006 @@ -317,3 +317,29 @@ { DX_STUB; } +HRESULT Hal_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) +{ + DX_STUB; +} + +HRESULT Hal_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags) +{ + DX_STUB; +} + +HRESULT Hal_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey) +{ + DX_STUB; +} + +HRESULT Hal_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_STUB; +} + +HRESULT Hal_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_STUB; +} + + Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sun Apr 9 01:05:49 2006 @@ -11,27 +11,34 @@ #include "rosdraw.h" +/* FIXME adding hal and hel stub + DestroySurface; + SetClipList; + AddAttachedSurface; + GetFlipStatus; + SetOverlayPosition; + SetPalette; +*/ + HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) -{ - DX_WINDBG_trace(); +{ return DDERR_ALREADYINITIALIZED; } ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) { - DX_WINDBG_trace(); - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - + + DX_WINDBG_trace(); + return InterlockedIncrement((PLONG)&This->owner->mDDrawGlobal.dsList->dwIntRefCnt); } ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) { - DX_WINDBG_trace(); - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + ULONG ref = InterlockedDecrement((PLONG)&This->owner->mDDrawGlobal.dsList->dwIntRefCnt); if (ref == 0) @@ -59,7 +66,7 @@ IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_SURFCB32_BLT) + if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT) { return Hal_DDrawSurface_Blt( iface, rdst, src, rsrc, dwFlags, lpbltfx); } @@ -75,7 +82,7 @@ IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_LOCK) { return Hal_DDrawSurface_Lock( iface, prect, pDDSD, flags, event); } @@ -87,7 +94,14 @@ { DX_WINDBG_trace(); - DX_STUB; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_LOCK) + { + return Hal_DDrawSurface_Unlock( iface, pRect); + } + + return Hel_DDrawSurface_Unlock( iface, pRect); } HRESULT WINAPI @@ -97,7 +111,6 @@ DX_WINDBG_trace(); IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - IDirectDrawSurfaceImpl* That = NULL; if (pAttach==NULL) @@ -192,8 +205,15 @@ LPDIRECTDRAWSURFACE7 override, DWORD dwFlags) { DX_WINDBG_trace(); - - DX_STUB; + + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_FLIP) + { + return Hal_DDrawSurface_Flip(iface, override, dwFlags); + } + + return Hel_DDrawSurface_Flip(iface, override, dwFlags); } HRESULT WINAPI @@ -217,9 +237,16 @@ HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { - DX_WINDBG_trace(); - - DX_STUB; + DX_WINDBG_trace(); + + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_FLIP) + { + return Hal_DDrawSurface_GetBltStatus( iface, dwFlags); + } + + return Hel_DDrawSurface_GetBltStatus( iface, dwFlags); } HRESULT WINAPI @@ -458,16 +485,17 @@ { DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetLOD (LPDIRECTDRAWSURFACE7 iface, DWORD dwMaxLOD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_SETCOLORKEY) + { + return Hal_DDrawSurface_SetColorKey (iface, dwFlags, pCKey); + } + + return Hel_DDrawSurface_SetColorKey (iface, dwFlags, pCKey); +} + + HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7 iface, @@ -525,7 +553,14 @@ { DX_WINDBG_trace(); - DX_STUB; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if (This->owner->mCallbacks.HALDDSurface.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) + { + return Hal_DDrawSurface_UpdateOverlayDisplay ( iface, dwFlags); + } + + return Hel_DDrawSurface_UpdateOverlayDisplay ( iface, dwFlags); } HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface, Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Apr 9 01:05:49 2006 @@ -148,9 +148,11 @@ HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter); HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); - - - +HRESULT Hal_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags); +HRESULT Hal_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey); +HRESULT Hal_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); +HRESULT Hal_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags); +HRESULT Hal_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags); HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 ); HRESULT Hel_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 ); @@ -163,6 +165,11 @@ HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); HRESULT Hel_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); +HRESULT Hel_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey); +HRESULT Hel_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); +HRESULT Hel_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags); +HRESULT Hel_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags); +HRESULT Hel_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags); /* Setting for HEL should be move to ros special reg key ? */ Modified: trunk/reactos/dll/directx/ddraw/soft/surface_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Sun Apr 9 01:05:49 2006 @@ -28,5 +28,31 @@ DX_STUB; } +HRESULT Hel_DDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) +{ + DX_STUB; +} + +HRESULT Hel_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags) +{ + DX_STUB; +} + +HRESULT Hel_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey) +{ + DX_STUB; +} + +HRESULT Hel_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_STUB; +} + +HRESULT Hel_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) +{ + DX_STUB; +} + +

1 0

[greatlrd] 21518: DirectDraw_EnumDisplayModes base on wine implenetins taking wine code and rewrite some part. it is not complete but it does the work. DirectDraw_SetDisplayMode remove the freq flag we ignore it for now. for EnumDisplayModes report modes that are being support for the graphic card. but the monitor does not support it
by aleksey＠studiocerebral.com 08 Apr '06

08 Apr '06

Author: greatlrd Date: Sat Apr 8 19:03:35 2006 New Revision: 21518 URL: http://svn.reactos.ru/svn/reactos?rev=21518&view=rev Log: DirectDraw_EnumDisplayModes base on wine implenetins taking wine code and rewrite some part. it is not complete but it does the work. DirectDraw_SetDisplayMode remove the freq flag we ignore it for now. for EnumDisplayModes report modes that are being support for the graphic card. but the monitor does not support it Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rbu… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sat Apr 8 19:03:35 2006 @@ -12,6 +12,7 @@ <library>d3d8thk</library> <library>dxguid</library> <library>ole32</library> + <library>user32</library> <file>ddraw.rc</file> <file>main.c</file> 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 Sat Apr 8 19:03:35 2006 @@ -10,6 +10,26 @@ #include "rosdraw.h" +static const DDPIXELFORMAT pixelformats[] = +{ + /* 8bpp paletted */ + { sizeof(DDPIXELFORMAT), DDPF_RGB|DDPF_PALETTEINDEXED8, 0, { 8 } }, + /* 15bpp 5/5/5 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0x7C00 }, { 0x3E0 }, + { 0x1F } }, + /* 16bpp 5/6/5 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0xF800 }, { 0x7E0 }, + { 0x1F } }, + /* 24bpp 8/8/8 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } }, + /* 32bpp 8/8/8 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 32 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } } +}; + + + /* * IMPLEMENT * Status this api is finish and is 100% correct @@ -18,6 +38,8 @@ WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) { + DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; if (iface==NULL) @@ -60,6 +82,8 @@ WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) { + DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; ULONG ref=0; @@ -80,6 +104,8 @@ WINAPI Main_DirectDraw_Release (LPDIRECTDRAW7 iface) { + DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; ULONG ref=0; @@ -118,6 +144,8 @@ // for now we always asume it is the active dirver that should be use. // - allow more Flags + DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; // check the parameters @@ -155,6 +183,8 @@ HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { + DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; BOOL dummy = TRUE; DWORD ret; @@ -171,13 +201,14 @@ /* Check use the Hal or Hel for SetMode */ if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE) { - ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + } else { ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); } - + if (ret == DD_OK) { DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); @@ -200,6 +231,8 @@ REFIID id, LPVOID *obj) { + DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; if (IsEqualGUID(&IID_IDirectDraw7, id)) @@ -231,6 +264,8 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { + DX_WINDBG_trace(); + HRESULT ret; DxSurf *surf; @@ -298,6 +333,8 @@ HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) { + DX_WINDBG_trace(); + if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; @@ -320,12 +357,16 @@ HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN pUnkOuter) { + DX_WINDBG_trace(); + return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter); } HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) { + DX_WINDBG_trace(); + if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; @@ -359,6 +400,8 @@ HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) { + DX_WINDBG_trace(); + DDSCAPS2 ddscaps; DWORD status = DD_FALSE; IDirectDrawImpl *This = (IDirectDrawImpl *)iface; @@ -389,7 +432,9 @@ } HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ +{ + DX_WINDBG_trace(); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; if (pDDSD == NULL) @@ -428,6 +473,8 @@ HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) { + DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) @@ -441,6 +488,8 @@ HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free) { + DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; @@ -454,6 +503,8 @@ HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) { + DX_WINDBG_trace(); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; if (freq == NULL) @@ -467,6 +518,8 @@ HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { + DX_WINDBG_trace(); + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE) @@ -479,6 +532,8 @@ HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) { + DX_WINDBG_trace(); + ChangeDisplaySettings(NULL, 0); return DD_OK; } @@ -487,42 +542,150 @@ HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) { + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, LPDIRECTDRAWSURFACE7* dst) { + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) { - DX_STUB; + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDSURFACEDESC2 desc_callback; + DEVMODE DevMode; + int iMode=0; + + if (pDDSD!=NULL) + { + // FIXME fill in pDDSD + } + + RtlZeroMemory(&desc_callback, sizeof(DDSURFACEDESC2)); + desc_callback.dwSize = sizeof(DDSURFACEDESC2); + + desc_callback.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_CAPS | DDSD_PITCH; + + if (dwFlags & DDEDM_REFRESHRATES) + { + desc_callback.dwFlags |= DDSD_REFRESHRATE; + desc_callback.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + } + + + /// FIXME check if the mode are suppretd before sending it back + + while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0)) + { + + if (pDDSD) + { + if ((pDDSD->dwFlags & DDSD_WIDTH) && (pDDSD->dwWidth != DevMode.dmPelsWidth)) + continue; + if ((pDDSD->dwFlags & DDSD_HEIGHT) && (pDDSD->dwHeight != DevMode.dmPelsHeight)) + continue; + if ((pDDSD->dwFlags & DDSD_PIXELFORMAT) && (pDDSD->ddpfPixelFormat.dwFlags & DDPF_RGB) && + (pDDSD->ddpfPixelFormat.dwRGBBitCount != DevMode.dmBitsPerPel)) + continue; + } + + + desc_callback.dwHeight = DevMode.dmPelsHeight; + desc_callback.dwWidth = DevMode.dmPelsWidth; + + if (DevMode.dmFields & DM_DISPLAYFREQUENCY) + { + desc_callback.dwRefreshRate = DevMode.dmDisplayFrequency; + } + + switch(DevMode.dmBitsPerPel) + { + case 8: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[0],sizeof(DDPIXELFORMAT)); + break; + + case 15: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[1],sizeof(DDPIXELFORMAT)); + break; + + case 16: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[2],sizeof(DDPIXELFORMAT)); + break; + + + case 24: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[3],sizeof(DDPIXELFORMAT)); + break; + + case 32: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[3],sizeof(DDPIXELFORMAT)); + break; + + default: + break; + } + + if (desc_callback.ddpfPixelFormat.dwRGBBitCount==15) + { + desc_callback.lPitch = DevMode.dmPelsWidth + (8 - ( DevMode.dmPelsWidth % 8)) % 8; + } + else + { + desc_callback.lPitch = DevMode.dmPelsWidth * (desc_callback.ddpfPixelFormat.dwRGBBitCount / 8); + desc_callback.lPitch = desc_callback.lPitch + (8 - (desc_callback.lPitch % 8)) % 8; + } + + desc_callback.ddsCaps.dwCaps = 0; + if (desc_callback.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) + { + desc_callback.ddsCaps.dwCaps |= DDSCAPS_PALETTE; + } + + + if (callback(&desc_callback, context) == DDENUMRET_CANCEL) + { + + return DD_OK; + } + + iMode++; + } + + return DD_OK; } HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, LPDDENUMSURFACESCALLBACK7 callback) { + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) { + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status) { + DX_WINDBG_trace(); DX_STUB; } @@ -531,33 +694,39 @@ HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) { + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) { + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) -{ +{ + DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) -{ +{ + DX_WINDBG_trace(); DX_STUB; } Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sat Apr 8 19:03:35 2006 @@ -14,11 +14,14 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { + DX_WINDBG_trace(); return DDERR_ALREADYINITIALIZED; } ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) { + DX_WINDBG_trace(); + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; return InterlockedIncrement((PLONG)&This->owner->mDDrawGlobal.dsList->dwIntRefCnt); @@ -26,6 +29,8 @@ ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) { + DX_WINDBG_trace(); + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; ULONG ref = InterlockedDecrement((PLONG)&This->owner->mDDrawGlobal.dsList->dwIntRefCnt); @@ -41,12 +46,16 @@ Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, LPVOID* ppObj) { + DX_WINDBG_trace(); + return E_NOINTERFACE; } HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { + DX_WINDBG_trace(); + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; @@ -62,6 +71,8 @@ HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event) { + DX_WINDBG_trace(); + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) @@ -74,6 +85,8 @@ HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) { + DX_WINDBG_trace(); + DX_STUB; } @@ -81,6 +94,8 @@ Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach) { + DX_WINDBG_trace(); + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; @@ -100,6 +115,8 @@ Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) { + DX_WINDBG_trace(); + DX_STUB; } @@ -108,12 +125,16 @@ DWORD dsty, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD trans) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface) { + DX_WINDBG_trace(); + DX_STUB; } @@ -123,12 +144,16 @@ LPDDBLTBATCH pBatch, DWORD dwCount, DWORD dwFlags) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface) { + DX_WINDBG_trace(); + DX_STUB; } @@ -137,6 +162,8 @@ DWORD dwFlags, LPDIRECTDRAWSURFACE7 pAttach) { + DX_WINDBG_trace(); + DX_STUB; } @@ -145,6 +172,8 @@ LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { + DX_WINDBG_trace(); + DX_STUB; } @@ -153,6 +182,8 @@ DWORD dwFlags, LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { + DX_WINDBG_trace(); + DX_STUB; } @@ -160,12 +191,16 @@ Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag) { + DX_WINDBG_trace(); + DX_STUB; } @@ -174,18 +209,24 @@ LPDDSCAPS2 pCaps, LPDIRECTDRAWSURFACE7* ppSurface) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) { + DX_WINDBG_trace(); + IDirectDrawSurfaceImpl* This; if (iface == NULL) @@ -210,6 +251,8 @@ Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWCLIPPER* ppClipper) { + DX_WINDBG_trace(); + DX_STUB; } @@ -217,12 +260,16 @@ Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) { + DX_WINDBG_trace(); + IDirectDrawSurfaceImpl* This; if (iface == NULL) @@ -258,17 +305,23 @@ HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD) { + DX_WINDBG_trace(); + DX_STUB; } @@ -276,12 +329,16 @@ Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface, LPLONG pX, LPLONG pY) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWPALETTE* ppPalette) { + DX_WINDBG_trace(); + DX_STUB; } @@ -289,6 +346,8 @@ Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7 iface, LPDDPIXELFORMAT pDDPixelFormat) { + DX_WINDBG_trace(); + DX_STUB; } @@ -296,6 +355,8 @@ Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwPriority) { + DX_WINDBG_trace(); + DX_STUB; } @@ -304,6 +365,8 @@ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) { + DX_WINDBG_trace(); + DX_STUB; } @@ -311,6 +374,8 @@ Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD) { + DX_WINDBG_trace(); + DX_STUB; } @@ -318,30 +383,40 @@ Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface, LPDWORD pValue) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) { + DX_WINDBG_trace(); + IDirectDrawSurfaceImpl* This; if (iface == NULL) @@ -372,6 +447,8 @@ Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWCLIPPER pDDClipper) { + DX_WINDBG_trace(); + DX_STUB; } @@ -379,12 +456,16 @@ Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_SetLOD (LPDIRECTDRAWSURFACE7 iface, DWORD dwMaxLOD) { + DX_WINDBG_trace(); + DX_STUB; } @@ -392,6 +473,8 @@ Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7 iface, LONG X, LONG Y) { + DX_WINDBG_trace(); + DX_STUB; } @@ -399,6 +482,8 @@ Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWPALETTE pPalette) { + DX_WINDBG_trace(); + DX_STUB; } @@ -406,6 +491,8 @@ Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface, DWORD dwPriority) { + DX_WINDBG_trace(); + DX_STUB; } @@ -414,6 +501,8 @@ REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) { + DX_WINDBG_trace(); + DX_STUB; } @@ -424,6 +513,8 @@ LPRECT pDstRect, DWORD dwFlags, LPDDOVERLAYFX pFX) { + DX_WINDBG_trace(); + DX_STUB; } @@ -432,12 +523,16 @@ Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) { + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef) { + DX_WINDBG_trace(); + DX_STUB; } 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 Sat Apr 8 19:03:35 2006 @@ -192,4 +192,24 @@ firstcall = FALSE; \ } +#define DX_WINDBG_trace() \ + static BOOL firstcallx = TRUE; \ + if (firstcallx) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + firstcallx = FALSE; \ + } + +#define DX_WINDBG_trace_res(width,height,bpp) \ + static BOOL firstcallxx = TRUE; \ + if (firstcallxx) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d\n",width,height,bpp); \ + OutputDebugStringA(buffer); \ + firstcallxx = FALSE; \ + } + #endif /* __DDRAW_PRIVATE */ Modified: trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Sat Apr 8 19:03:35 2006 @@ -72,8 +72,11 @@ mode.dmPelsWidth = dwWidth; mode.dmPelsHeight = dwHeight; mode.dmBitsPerPel = dwBPP; - mode.dmDisplayFrequency = dwRefreshRate; + + //mode.dmDisplayFrequency = dwRefreshRate; mode.dmFields = 0; + + DX_STUB_str("in hel"); if(dwWidth) mode.dmFields |= DM_PELSWIDTH; @@ -81,12 +84,14 @@ mode.dmFields |= DM_PELSHEIGHT; if(dwBPP) mode.dmFields |= DM_BITSPERPEL; + /* if(dwRefreshRate) mode.dmFields |= DM_DISPLAYFREQUENCY; - + */ if (ChangeDisplaySettings(&mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) return DDERR_UNSUPPORTEDMODE; + // TODO: reactivate ddraw object, maximize window, set it in foreground // and set excluive mode (if implemented by the driver)

1 0

[greatlrd] 21517: ReImplement Surface_GetDC Implement Surface_ReleaseDC
by aleksey＠studiocerebral.com 08 Apr '06

08 Apr '06

Author: greatlrd Date: Sat Apr 8 13:38:26 2006 New Revision: 21517 URL: http://svn.reactos.ru/svn/reactos?rev=21517&view=rev Log: ReImplement Surface_GetDC Implement Surface_ReleaseDC Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sat Apr 8 13:38:26 2006 @@ -236,10 +236,16 @@ } This = (IDirectDrawSurfaceImpl*)iface; + + /* + FIXME check if the surface exists or not + for now we aussme the surface exits and create the hDC for it + */ if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) { - *phDC = (HDC)This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; + This->Surf->mPrimaryLocal.hDC = (ULONG_PTR)GetDC((HWND)This->owner->mDDrawGlobal.lpExclusiveOwner->hWnd); + *phDC = (HDC)This->Surf->mPrimaryLocal.hDC; } else { @@ -336,7 +342,30 @@ HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) { - DX_STUB; + IDirectDrawSurfaceImpl* This; + + if (iface == NULL) + { + return DDERR_INVALIDOBJECT; + } + + if (hDC == NULL) + { + return DDERR_INVALIDPARAMS; + } + + This = (IDirectDrawSurfaceImpl*)iface; + + /* FIXME check if surface exits or not */ + + if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) + { + return DDERR_GENERIC; + } + + ReleaseDC((HWND)This->owner->mDDrawGlobal.lpExclusiveOwner->hWnd,hDC); + + return DD_OK; } HRESULT WINAPI

1 0

[greatlrd] 21516: Implement Surface_GetDC
by aleksey＠studiocerebral.com 08 Apr '06

08 Apr '06

Author: greatlrd Date: Sat Apr 8 13:04:42 2006 New Revision: 21516 URL: http://svn.reactos.ru/svn/reactos?rev=21516&view=rev Log: Implement Surface_GetDC Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/surface_hel.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 Sat Apr 8 13:04:42 2006 @@ -69,10 +69,13 @@ That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; + + mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; + if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; @@ -82,12 +85,15 @@ { return mDdCreateSurface.ddRVal; } + + return DD_OK; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { + DX_STUB_str( "Can not create overlay surface"); ////memset(&This->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); //memcpy(&This->mddsdOverlay,pDDSD,sizeof(DDSURFACEDESC)); //This->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); @@ -208,19 +214,19 @@ } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) { - DX_STUB; + DX_STUB_str( "Can not create backbuffer surface"); } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) { - DX_STUB; + DX_STUB_str( "Can not create texture surface"); } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) { - DX_STUB; + DX_STUB_str( "Can not create zbuffer surface"); } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) { - DX_STUB; + DX_STUB_str( "Can not create offscreenplain surface"); } return DDERR_INVALIDSURFACETYPE; @@ -289,6 +295,7 @@ // This->Surf->mpPrimaryLocals[0]->hDC = This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; // FIXME dectect if it clipped or not + DX_STUB_str( "Can not create offscreenplain surface"); mDdBlt.IsClipped = FALSE; if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) @@ -304,3 +311,9 @@ return DD_OK; } + +HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 + pDDSD, DWORD flags, HANDLE event) +{ + DX_STUB; +} Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sat Apr 8 13:04:42 2006 @@ -61,16 +61,15 @@ HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event) -{ /* - IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)iface; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) +{ + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if (This->owner->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) { - return Hal_DDrawSurface_Lock( iiface, LPRECT prect, pDDSD, flags, event); + return Hal_DDrawSurface_Lock( iface, prect, pDDSD, flags, event); } - return Hel_DDrawSurface_Lock( iiface, LPRECT prect, pDDSD, flags, event);*/ - DX_STUB; + return Hel_DDrawSurface_Lock( iface, prect, pDDSD, flags, event); } HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) @@ -224,7 +223,30 @@ HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) { - DX_STUB; + IDirectDrawSurfaceImpl* This; + + if (iface == NULL) + { + return DDERR_INVALIDOBJECT; + } + + if (phDC == NULL) + { + return DDERR_INVALIDPARAMS; + } + + This = (IDirectDrawSurfaceImpl*)iface; + + if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) + { + *phDC = (HDC)This->owner->mDDrawGlobal.lpExclusiveOwner->hDC; + } + else + { + *phDC = (HDC)This->Surf->mpPrimaryLocals[0]->hDC; + } + + return DD_OK; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.h… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat Apr 8 13:04:42 2006 @@ -147,7 +147,10 @@ HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); HRESULT Hal_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IDirectDrawSurfaceImpl *ppSurf, IUnknown *pUnkOuter); +HRESULT Hal_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); + + HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 ); HRESULT Hel_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 ); @@ -159,6 +162,7 @@ HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DWORD , DWORD ); HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); HRESULT Hel_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); +HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE event); /* Setting for HEL should be move to ros special reg key ? */ @@ -178,4 +182,14 @@ } \ return DDERR_UNSUPPORTED; +#define DX_STUB_str(x) \ + static BOOL firstcall = TRUE; \ + if (firstcall) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + firstcall = FALSE; \ + } + #endif /* __DDRAW_PRIVATE */ Modified: trunk/reactos/dll/directx/ddraw/soft/surface_hel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_hel.c Sat Apr 8 13:04:42 2006 @@ -21,3 +21,12 @@ { DX_STUB; } + +HRESULT Hel_DDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 + pDDSD, DWORD flags, HANDLE event) +{ + DX_STUB; +} + + +

1 0

[gedmurphy] 21515: - allow container windows on the docking toolbars - hide comboboxes if toolbar is vertical - patch from Thomas
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: gedmurphy Date: Sat Apr 8 03:21:12 2006 New Revision: 21515 URL: http://svn.reactos.ru/svn/reactos?rev=21515&view=rev Log: - allow container windows on the docking toolbars - hide comboboxes if toolbar is vertical - patch from Thomas Removed: trunk/reactos/base/applications/imagesoft/buttons.h Modified: trunk/reactos/base/applications/imagesoft/imageprop.c trunk/reactos/base/applications/imagesoft/imagesoft.rbuild trunk/reactos/base/applications/imagesoft/imagesoft.rc trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/misc.c trunk/reactos/base/applications/imagesoft/opensave.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp trunk/reactos/base/applications/imagesoft/resource.h trunk/reactos/base/applications/imagesoft/tooldock.c Removed: trunk/reactos/base/applications/imagesoft/buttons.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/buttons.h (original) +++ trunk/reactos/base/applications/imagesoft/buttons.h (removed) @@ -1,39 +1,0 @@ -/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - -TBBUTTON StdButtons[] = { - {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ - {TBICON_OPEN, ID_OPEN, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ - {TBICON_SAVE, ID_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_PRINT, ID_PRINTPRE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print */ - {TBICON_PRINTPRE, ID_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print preview */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_CUT, ID_CUT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* cut */ - {TBICON_COPY, ID_COPY, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* copy */ - {TBICON_PASTE, ID_PASTE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* paste */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_UNDO, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ - {TBICON_REDO, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, -}; - -TBBUTTON TextButtons[] = { - {TBICON_BOLD, ID_BOLD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* bold */ - {TBICON_ITALIC, ID_ITALIC, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* italic */ - {TBICON_ULINE, ID_ULINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* underline */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_TXTLEFT, ID_TXTLEFT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* left justified */ - {TBICON_TXTCENTER,ID_TXTCENTER,TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* centered */ - {TBICON_TXTRIGHT, ID_TXTRIGHT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* right justified */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ -}; Modified: trunk/reactos/base/applications/imagesoft/imageprop.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imageprop.c (original) +++ trunk/reactos/base/applications/imagesoft/imageprop.c Sat Apr 8 03:21:12 2006 @@ -5,9 +5,9 @@ UINT ConvertValue(HWND hDlg, UINT EdBoxChanged, UINT LastUnitSel) { LONG Resolution = GetDlgItemInt(hDlg, IDC_RES_EDIT, NULL, FALSE); - FLOAT Width = GetDlgItemInt(hDlg, IDC_WIDTH_EDIT, NULL, FALSE); - FLOAT Height = GetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, NULL, FALSE); - USHORT CurUnit = SendMessage(hUnitType, CB_GETCURSEL, 0, 0); + FLOAT Width = (FLOAT)GetDlgItemInt(hDlg, IDC_WIDTH_EDIT, NULL, FALSE); + FLOAT Height = (FLOAT)GetDlgItemInt(hDlg, IDC_HEIGHT_EDIT, NULL, FALSE); + USHORT CurUnit = (USHORT)SendMessage(hUnitType, CB_GETCURSEL, 0, 0); /* if the user typed in the resolution box */ if ((EdBoxChanged == IDC_RES_EDIT) && (CurUnit != PIXELS)) Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rbuild (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rbuild Sat Apr 8 03:21:12 2006 @@ -7,7 +7,6 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> - <library>ntdll</library> <library>kernel32</library> <library>gdi32</library> <library>user32</library> Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rc (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rc Sat Apr 8 03:21:12 2006 @@ -2,15 +2,15 @@ #include <commctrl.h> #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS image editor\0" -#define REACTOS_STR_INTERNAL_NAME "imagesoft\0" -#define REACTOS_STR_ORIGINAL_FILENAME "imagesoft.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS image editor\0" +#define REACTOS_STR_INTERNAL_NAME "imagesoft\0" +#define REACTOS_STR_ORIGINAL_FILENAME "imagesoft.exe\0" #include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 24 DISCARDABLE "manifest.xml" - + STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ImageSoft" Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Sat Apr 8 03:21:12 2006 @@ -1,11 +1,54 @@ #include <precomp.h> -#include "buttons.h" static const TCHAR szMainWndClass[] = TEXT("ImageSoftWndClass"); #define ID_MDI_FIRSTCHILD 50000 #define ID_MDI_WINDOWMENU 5 #define NUM_FLT_WND 3 + +/* toolbar buttons */ +TBBUTTON StdButtons[] = { +/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ + {TBICON_OPEN, ID_OPEN, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ + {TBICON_SAVE, ID_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_PRINT, ID_PRINTPRE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print */ + {TBICON_PRINTPRE, ID_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print preview */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_CUT, ID_CUT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* cut */ + {TBICON_COPY, ID_COPY, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* copy */ + {TBICON_PASTE, ID_PASTE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* paste */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_UNDO, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ + {TBICON_REDO, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, +}; + +TBBUTTON TextButtons[] = { + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_BOLD, ID_BOLD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* bold */ + {TBICON_ITALIC, ID_ITALIC, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* italic */ + {TBICON_ULINE, ID_ULINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* underline */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_TXTLEFT, ID_TXTLEFT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* left justified */ + {TBICON_TXTCENTER,ID_TXTCENTER,TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* centered */ + {TBICON_TXTRIGHT, ID_TXTRIGHT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* right justified */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ +}; + + /* menu hints */ static const MENU_HINT MainMenuHintTable[] = { @@ -111,7 +154,7 @@ { const TBBUTTON *Buttons = NULL; UINT NumButtons = 0; - UINT StartImageRes; + UINT StartImageRes = 0; HWND hWndClient = NULL; UNREFERENCED_PARAMETER(Context); @@ -207,6 +250,40 @@ } } + switch (Dockbar->BarId) + { + case ID_TOOLBAR_TEXT: + { + HWND hWndCombo; + + /* drop combo box into container window */ + hWndCombo = CreateWindowEx(0, + WC_COMBOBOX, + NULL, + WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, + 0, 0, 120, 25, + hParent, + NULL, + hInstance, + NULL); + if (hWndCombo != NULL) + { + SetParent(hWndCombo, + hWndClient); + + if (!ToolbarInsertSpaceForControl(hWndClient, + hWndCombo, + 0, + ID_TXTFONTNAME, + TRUE)) + { + DestroyWindow(hWndCombo); + } + } + break; + } + } + if (hWndClient != NULL) { *hwnd = hWndClient; @@ -275,6 +352,15 @@ } } return TRUE; +} + +static VOID +TbCustomControlChange(HWND hWndToolbar, + HWND hWndControl, + BOOL Vert) +{ + /* the toolbar changed from horizontal to vertical or vice versa... */ + return; } static VOID CALLBACK @@ -317,6 +403,9 @@ 0, (LPARAM)dwStyle); + ToolbarUpdateControlSpaces(rbi->hwndChild, + TbCustomControlChange); + if (SendMessage(rbi->hwndChild, TB_GETMAXSIZE, 0, @@ -630,6 +719,7 @@ InitMainWnd(PMAIN_WND_INFO Info) { CLIENTCREATESTRUCT ccs; + INT statwidths[] = {110, -1}; /* FIXME - create controls and initialize the application */ @@ -646,6 +736,12 @@ (HMENU)IDC_STATUSBAR, hInstance, NULL); + + if (Info->hStatus != NULL) + SendMessage(Info->hStatus, + SB_SETPARTS, + sizeof(statwidths)/sizeof(int), + (LPARAM)statwidths); /* create the MDI client window */ ccs.hWindowMenu = GetSubMenu(GetMenu(Info->hSelf), @@ -921,11 +1017,33 @@ case WM_NOTIFY: { + UINT BarId; + LPNMHDR pnmhdr = (LPNMHDR)lParam; if (!TbdHandleNotifications(&Info->ToolDocks, - (LPNMHDR)lParam, + pnmhdr, &Ret)) { - /* FIXME - handle other notifications */ + if (TbdDockBarIdFromClientWindow(&Info->ToolDocks, + pnmhdr->hwndFrom, + &BarId)) + { + switch (BarId) + { + case ID_TOOLBAR_TEXT: + switch (pnmhdr->code) + { + case TBN_DELETINGBUTTON: + { + LPNMTOOLBAR lpnmtb = (LPNMTOOLBAR)lParam; + + ToolbarDeleteControlSpace(pnmhdr->hwndFrom, + &lpnmtb->tbButton); + break; + } + } + break; + } + } } break; } Modified: trunk/reactos/base/applications/imagesoft/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/misc.c (original) +++ trunk/reactos/base/applications/imagesoft/misc.c Sat Apr 8 03:21:12 2006 @@ -47,7 +47,7 @@ uID); if (ln++ > 0) { - (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, + (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED, ln * sizeof(TCHAR)); if ((*lpTarget) != NULL) { @@ -207,3 +207,169 @@ { MessageBox(NULL, _itot(num, NULL, 10), NULL, 0); } + +/* + * Toolbar custom control routines + */ + +typedef struct _TBCUSTCTL +{ + HWND hWndControl; + INT iCommand; + BOOL HideVertical : 1; + BOOL IsVertical : 1; +} TBCUSTCTL, *PTBCUSTCTL; + +BOOL +ToolbarDeleteControlSpace(HWND hWndToolbar, + const TBBUTTON *ptbButton) +{ + if ((ptbButton->fsStyle & TBSTYLE_SEP) && + ptbButton->dwData != 0) + { + PTBCUSTCTL cctl = (PTBCUSTCTL)ptbButton->dwData; + + DestroyWindow(cctl->hWndControl); + + HeapFree(ProcessHeap, + 0, + cctl); + return TRUE; + } + + return FALSE; +} + +VOID +ToolbarUpdateControlSpaces(HWND hWndToolbar, + ToolbarChangeControlCallback ChangeCallback) +{ + BOOL Vert; + DWORD nButtons, i; + TBBUTTON tbtn; + + Vert = ((SendMessage(hWndToolbar, + TB_GETSTYLE, + 0, + 0) & CCS_VERT) != 0); + + nButtons = SendMessage(hWndToolbar, + TB_BUTTONCOUNT, + 0, + 0); + + for (i = 0; + i != nButtons; + i++) + { + if (SendMessage(hWndToolbar, + TB_GETBUTTON, + (WPARAM)i, + (LPARAM)&tbtn)) + { + if ((tbtn.fsStyle & TBSTYLE_SEP) && tbtn.dwData != 0) + { + PTBCUSTCTL cctl = (PTBCUSTCTL)tbtn.dwData; + + cctl->IsVertical = Vert; + + if (cctl->HideVertical) + { + ShowWindow(cctl->hWndControl, + (Vert ? SW_HIDE : SW_SHOW)); + goto ShowHideSep; + } + else if (cctl->IsVertical != Vert) + { + ChangeCallback(hWndToolbar, + cctl->hWndControl, + Vert); + +ShowHideSep: + /* show/hide the separator */ + SendMessage(hWndToolbar, + TB_HIDEBUTTON, + (WPARAM)cctl->iCommand, + (LPARAM)Vert && cctl->HideVertical); + } + } + } + } +} + +BOOL +ToolbarInsertSpaceForControl(HWND hWndToolbar, + HWND hWndControl, + INT Index, + INT iCmd, + BOOL HideVertical) +{ + PTBCUSTCTL cctl; + RECT rcControl, rcItem; + + cctl = HeapAlloc(ProcessHeap, + 0, + sizeof(TBCUSTCTL)); + if (cctl == NULL) + return FALSE; + + cctl->HideVertical = HideVertical; + cctl->hWndControl = hWndControl; + cctl->iCommand = iCmd; + + if (GetWindowRect(hWndControl, + &rcControl)) + { + TBBUTTON tbtn = {0}; + + tbtn.iBitmap = rcControl.right - rcControl.left; + tbtn.idCommand = iCmd; + tbtn.fsStyle = TBSTYLE_SEP; + tbtn.dwData = (DWORD_PTR)cctl; + + if (SendMessage(hWndToolbar, + TB_GETSTYLE, + 0, + 0) & CCS_VERT) + { + if (HideVertical) + tbtn.fsState |= TBSTATE_HIDDEN; + + cctl->IsVertical = TRUE; + } + else + cctl->IsVertical = FALSE; + + if (SendMessage(hWndToolbar, + TB_INSERTBUTTON, + (WPARAM)Index, + (LPARAM)&tbtn)) + { + if (SendMessage(hWndToolbar, + TB_GETITEMRECT, + (WPARAM)Index, + (LPARAM)&rcItem)) + { + SetWindowPos(hWndControl, + NULL, + rcItem.left, + rcItem.top, + rcItem.right - rcItem.left, + rcItem.bottom - rcItem.top, + SWP_NOZORDER); + + ShowWindow(hWndControl, + SW_SHOW); + + return TRUE; + } + else if (tbtn.fsState & TBSTATE_HIDDEN) + { + ShowWindow(hWndControl, + SW_HIDE); + } + } + } + + return FALSE; +} Modified: trunk/reactos/base/applications/imagesoft/opensave.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/opensave.c (original) +++ trunk/reactos/base/applications/imagesoft/opensave.c Sat Apr 8 03:21:12 2006 @@ -37,7 +37,7 @@ _T("TAG Image File Format (*tif)\0*.tif\0") \ _T("Portable Network Graphics (*png)\0*.png\0\0");*/ - static TCHAR Filter[] = _T("Windows Bitmap (*bmp)\0*.bmp\0"); + static TCHAR Filter[] = _T("Windows Bitmap (*.bmp)\0*.bmp\0"); ofn.lpstrFilter = Filter; ofn.lpstrFile = szFileName; Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Sat Apr 8 03:21:12 2006 @@ -19,7 +19,10 @@ #ifndef RBN_CHEVRONPUSHED #define RBN_CHEVRONPUSHED (RBN_FIRST - 10) #endif -ULONG DbgPrint(PCH Format,...); + +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif #define MAX_KEY_LENGTH 256 #define NUM_MAINTB_IMAGES 10 @@ -152,8 +155,8 @@ BOOL InitImageEditWindowImpl(VOID); VOID UninitImageEditWindowImpl(VOID); + /* tooldock.c */ - typedef enum { TOP_DOCK = 0, @@ -251,6 +254,9 @@ const DOCKBAR *Dockbar, PVOID Context, const DOCKBAR_ITEM_CALLBACKS *DockbarCallbacks); +BOOL TbdDockBarIdFromClientWindow(PTOOLBAR_DOCKS TbDocks, + HWND hWndClient, + UINT *Id); BOOL TbdHandleNotifications(PTOOLBAR_DOCKS TbDocks, LPNMHDR pnmh, LRESULT *Result); @@ -334,6 +340,21 @@ VOID MessageBoxInt(INT num); +BOOL ToolbarDeleteControlSpace(HWND hWndToolbar, + const TBBUTTON *ptbButton); + +typedef VOID (*ToolbarChangeControlCallback)(HWND hWndToolbar, + HWND hWndControl, + BOOL Vert); +VOID ToolbarUpdateControlSpaces(HWND hWndToolbar, + ToolbarChangeControlCallback ChangeCallback); + +BOOL ToolbarInsertSpaceForControl(HWND hWndToolbar, + HWND hWndControl, + INT Index, + INT iCmd, + BOOL HideVertical); + /* opensave.c */ VOID FileInitialize(HWND hwnd); BOOL DoOpenFile(HWND hwnd, LPTSTR lpFileName, LPTSTR lpName); Modified: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/imagesoft/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/resource.h (original) +++ trunk/reactos/base/applications/imagesoft/resource.h Sat Apr 8 03:21:12 2006 @@ -35,6 +35,7 @@ #define ID_TXTLEFT 2033 #define ID_TXTCENTER 2034 #define ID_TXTRIGHT 2035 +#define ID_TXTFONTNAME 2036 #define ID_REFRESH 3000 #define ID_HELP 3001 Modified: trunk/reactos/base/applications/imagesoft/tooldock.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/tooldock.c (original) +++ trunk/reactos/base/applications/imagesoft/tooldock.c Sat Apr 8 03:21:12 2006 @@ -261,6 +261,30 @@ { /* Nothing to do */ } +} + +BOOL +TbdDockBarIdFromClientWindow(PTOOLBAR_DOCKS TbDocks, + HWND hWndClient, + UINT *Id) +{ + PDOCKBAR_ITEM Item; + BOOL Ret = FALSE; + + Item = TbDocks->Items; + while (Item != NULL) + { + if (Item->hWndClient == hWndClient) + { + *Id = Item->DockBar.BarId; + Ret = TRUE; + break; + } + + Item = Item->Next; + } + + return Ret; } BOOL @@ -976,13 +1000,13 @@ BOOL KeepActive = *(BOOL*)wParam; HWND hWndActivate = *(HWND*)lParam; PDOCKBAR_ITEM Item; -DbgPrint("-- 0x%p --\n", hWnd); + Item = TbDocks->Items; while (Item != NULL) { if (Item->hWndTool != NULL && Item->hWndTool == hWndActivate) - {DbgPrint("Activate toolbars (0x%p)\n", hWndActivate); + { KeepActive = TRUE; SynchronizeSiblings = FALSE; break; @@ -1000,7 +1024,7 @@ if (Item->hWndTool != NULL && Item->hWndTool != hWnd && Item->hWndTool != hWndActivate) - {DbgPrint("WM_NCACTIVE %p (wnd %p)\n", KeepActive, Item->hWndTool); + { SendMessage(Item->hWndTool, WM_NCACTIVATE, (WPARAM)KeepActive,

1 0

[greatlrd] 21514: 1. Implement Surface_GetCaps 2. Implement AddAttachedSurface not tested
by aleksey＠studiocerebral.com 07 Apr '06

07 Apr '06

Author: greatlrd Date: Sat Apr 8 02:18:17 2006 New Revision: 21514 URL: http://svn.reactos.ru/svn/reactos?rev=21514&view=rev Log: 1. Implement Surface_GetCaps 2. Implement AddAttachedSurface not tested Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Sat Apr 8 02:18:17 2006 @@ -82,7 +82,18 @@ Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach) { - DX_STUB; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + + IDirectDrawSurfaceImpl* That = NULL; + if (pAttach==NULL) + { + return DDERR_INVALIDOBJECT; + } + That = (IDirectDrawSurfaceImpl*)pAttach; + + //FIXME Have I put This and That in right order ?? DdAttachSurface(from, to) + return DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]); } /* MSDN: "not currently implemented." */ @@ -176,7 +187,24 @@ HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) { - DX_STUB; + IDirectDrawSurfaceImpl* This; + + if (iface == NULL) + { + return DDERR_INVALIDOBJECT; + } + + if (pCaps == NULL) + { + return DDERR_INVALIDPARAMS; + } + + This = (IDirectDrawSurfaceImpl*)iface; + + RtlZeroMemory(pCaps,sizeof(DDSCAPS2)); + pCaps->dwCaps = This->Surf->mddsdPrimary.ddsCaps.dwCaps; + + return DD_OK; } HRESULT WINAPI

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