Ros-diffs

ros-diffs@reactos.org

81390 discussions

[lsuggs] 43814: libdns should now compile but not link, it depends on libisc. libisc is closer to compiling, but not quite there yet.
by lsuggs＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: lsuggs Date: Wed Oct 28 18:23:11 2009 New Revision: 43814 URL: http://svn.reactos.org/svn/reactos?rev=43814&view=rev Log: libdns should now compile but not link, it depends on libisc. libisc is closer to compiling, but not quite there yet. Added: branches/nslookup/dll/3rdparty/dns/code.h (with props) branches/nslookup/dll/3rdparty/dns/dns.rbuild (with props) branches/nslookup/dll/3rdparty/dns/include/dns/enumclass.h (with props) branches/nslookup/dll/3rdparty/dns/include/dns/enumtype.h (with props) branches/nslookup/dll/3rdparty/dns/include/dns/rdatastruct.h (with props) branches/nslookup/dll/3rdparty/isc/include/config.h (with props) branches/nslookup/dll/3rdparty/isc/include/versions.h (with props) branches/nslookup/dll/3rdparty/isc/isc.rbuild (with props) Modified: branches/nslookup/dll/3rdparty/3rdparty.rbuild branches/nslookup/dll/3rdparty/isc/include/isc/log.h branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h branches/nslookup/dll/3rdparty/isc/win32/include/isc/stat.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/nslookup/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/3rdparty.… Added: branches/nslookup/dll/3rdparty/dns/code.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/code.… Added: branches/nslookup/dll/3rdparty/dns/dns.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/dns.r… Added: branches/nslookup/dll/3rdparty/dns/include/dns/enumclass.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/inclu… Added: branches/nslookup/dll/3rdparty/dns/include/dns/enumtype.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/inclu… Added: branches/nslookup/dll/3rdparty/dns/include/dns/rdatastruct.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/inclu… Added: branches/nslookup/dll/3rdparty/isc/include/config.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… Modified: branches/nslookup/dll/3rdparty/isc/include/isc/log.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… Added: branches/nslookup/dll/3rdparty/isc/include/versions.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… Added: branches/nslookup/dll/3rdparty/isc/isc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/isc.r… Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/stat.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32…

1 0

[khornicek] 43813: - preparation for initial palette support
by khornicek＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: khornicek Date: Wed Oct 28 17:03:10 2009 New Revision: 43813 URL: http://svn.reactos.org/svn/reactos?rev=43813&view=rev Log: - preparation for initial palette support Added: branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c (with props) Modified: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c branches/reactx/reactos/dll/directx/ddraw/Palette/palette_stubs.c branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild Modified: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c [iso-8859-1] Wed Oct 28 17:03:10 2009 @@ -4,9 +4,111 @@ * PROJECT: ReactOS DirectX * FILE: ddraw/Palette/palette.c * PURPOSE: IDirectDrawPalette Implementation - * PROGRAMMER: + * PROGRAMMER: Kamil Hornicek * */ #include "rosdraw.h" +LPDDRAWI_DDRAWPALETTE_INT +internal_directdrawpalette_int_alloc(LPDDRAWI_DDRAWPALETTE_INT This) +{ + LPDDRAWI_DDRAWPALETTE_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DDRAWPALETTE_INT)); + if (newThis) + { + newThis->lpLcl = This->lpLcl; + newThis->lpLink = This; + } + + return newThis; +} + +ULONG WINAPI +Main_DirectDrawPalette_AddRef(LPDIRECTDRAWPALETTE iface) +{ + LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT)iface; + ULONG ref = 0; + + AcquireDDThreadLock(); + + _SEH2_TRY + { + ref = ++This->dwIntRefCnt; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END + + ReleaseDDThreadLock(); + + return ref; +} + +HRESULT WINAPI +Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface, REFIID refiid, LPVOID *ppObj) +{ + HRESULT retVal = DD_OK; + *ppObj = NULL; + LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT) iface; + + DX_WINDBG_trace(); + + _SEH2_TRY + { + if (IsEqualGUID(refiid, &IID_IUnknown) || IsEqualGUID(refiid, &IID_IDirectDrawPalette)) + { + if (This->lpVtbl != &DirectDrawPalette_Vtable) + { + This = internal_directdrawpalette_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH2_LEAVE; + } + } + This->lpVtbl = &DirectDrawPalette_Vtable; + *ppObj = This; + Main_DirectDrawPalette_AddRef((LPDIRECTDRAWPALETTE)This); + } + else + { + DX_STUB_str("E_NOINTERFACE\n"); + retVal = E_NOINTERFACE; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + return retVal; +} + +ULONG WINAPI +Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface) +{ + ULONG ref = 0; + LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT)iface; + + AcquireDDThreadLock(); + + _SEH2_TRY + { + This->dwIntRefCnt--; + ref = This->dwIntRefCnt; + if(ref == 0) + { + DxHeapMemFree(This); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END + + ReleaseDDThreadLock(); + + return ref; +} Modified: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Palette/palette_stubs.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Palette/palette_stubs.c [iso-8859-1] Wed Oct 28 17:03:10 2009 @@ -10,24 +10,8 @@ #include "rosdraw.h" -ULONG WINAPI -DirectDrawPalette_Release( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawPalette_AddRef( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - HRESULT WINAPI -DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface, +Main_DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface, LPDIRECTDRAW ddraw, DWORD dwFlags, LPPALETTEENTRY palent) @@ -37,7 +21,7 @@ } HRESULT WINAPI -DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, +Main_DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent) @@ -47,7 +31,7 @@ } HRESULT WINAPI -DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, +Main_DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, @@ -57,29 +41,9 @@ DX_STUB; } HRESULT WINAPI -DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, +Main_DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, LPDWORD lpdwCaps) { DX_WINDBG_trace(); DX_STUB; } - -HRESULT WINAPI -DirectDrawPalette_QueryInterface( LPDIRECTDRAWPALETTE iface, - REFIID refiid, - LPVOID *obj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = -{ - DirectDrawPalette_QueryInterface, - DirectDrawPalette_AddRef, - DirectDrawPalette_Release, - DirectDrawPalette_GetCaps, - DirectDrawPalette_GetEntries, - DirectDrawPalette_Initialize, - DirectDrawPalette_SetEntries -}; Added: branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c (added) +++ branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c [iso-8859-1] Wed Oct 28 17:03:10 2009 @@ -1,0 +1,36 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface); +ULONG WINAPI Main_DirectDrawPalette_AddRef(LPDIRECTDRAWPALETTE iface); +HRESULT WINAPI Main_DirectDrawPalette_Initialize(LPDIRECTDRAWPALETTE iface, LPDIRECTDRAW ddraw, DWORD dwFlags, LPPALETTEENTRY palent); +HRESULT WINAPI Main_DirectDrawPalette_GetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent); +HRESULT WINAPI Main_DirectDrawPalette_SetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent); +HRESULT WINAPI Main_DirectDrawPalette_GetCaps(LPDIRECTDRAWPALETTE iface, LPDWORD lpdwCaps); +HRESULT WINAPI Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface, REFIID refiid, LPVOID *obj); + +IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = +{ + Main_DirectDrawPalette_QueryInterface, + Main_DirectDrawPalette_AddRef, + Main_DirectDrawPalette_Release, + Main_DirectDrawPalette_GetCaps, + Main_DirectDrawPalette_GetEntries, + Main_DirectDrawPalette_Initialize, + Main_DirectDrawPalette_SetEntries +}; + Propchange: branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Wed Oct 28 17:03:10 2009 @@ -61,6 +61,7 @@ <file>DirectDraw4_Vtable.c</file> <file>DirectDraw2_Vtable.c</file> <file>DirectDraw_Vtable.c</file> + <file>DirectDrawPalette_Vtable.c</file> <file>DirectDrawSurface7_Vtable.c</file> <file>DirectDrawSurface4_Vtable.c</file> <file>DirectDrawSurface3_Vtable.c</file>

1 0

[khornicek] 43812: - fix DDrawSurface_Release for now + more minor fixes
by khornicek＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: khornicek Date: Wed Oct 28 16:22:45 2009 New Revision: 43812 URL: http://svn.reactos.org/svn/reactos?rev=43812&view=rev Log: - fix DDrawSurface_Release for now + more minor fixes Added: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c (with props) Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Wed Oct 28 16:22:45 2009 @@ -117,7 +117,7 @@ else { *obj = NULL; - DX_STUB_str("E_NOINTERFACE"); + DX_STUB_str("E_NOINTERFACE\n"); retVal = E_NOINTERFACE; } } @@ -533,6 +533,9 @@ } _SEH2_END; + if(*ppSurf != NULL) + Main_DirectDraw_AddRef(This); + LeaveCriticalSection(&ddcs); return ret; } @@ -540,11 +543,3 @@ /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ /* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */ - - - - - - - - Added: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c (added) +++ branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c [iso-8859-1] Wed Oct 28 16:22:45 2009 @@ -1,0 +1,12 @@ +/* $Id: palette.c $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/Palette/palette.c + * PURPOSE: IDirectDrawPalette Implementation + * PROGRAMMER: + * + */ + +#include "rosdraw.h" + Propchange: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Wed Oct 28 16:22:45 2009 @@ -264,12 +264,27 @@ ULONG WINAPI Main_DDrawSurface_Release(LPDDRAWI_DDRAWSURFACE_INT This) { - - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; + ULONG ref = 0; + + AcquireDDThreadLock(); + + _SEH2_TRY + { + This->dwIntRefCnt--; + ref = This->dwIntRefCnt; + if(!ref) + { + DxHeapMemFree(This); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END + + ReleaseDDThreadLock(); + + return ref; } Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Wed Oct 28 16:22:45 2009 @@ -9,7 +9,7 @@ <library>d3d8thk</library> <library>dxguid</library> <library>ole32</library> - <library>user32</library> + <library>uuid</library> <library>advapi32</library> <library>pseh</library> @@ -50,6 +50,7 @@ <file>kernel_stubs.c</file> </directory> <directory name="Palette"> + <file>palette_main.c</file> <file>palette_stubs.c</file> </directory> <directory name="Videoport">

1 0

[spetreolle] 43811: add winmm winetest
by spetreolle＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: spetreolle Date: Wed Oct 28 16:15:59 2009 New Revision: 43811 URL: http://svn.reactos.org/svn/reactos?rev=43811&view=rev Log: add winmm winetest Added: trunk/rostests/winetests/winmm/ trunk/rostests/winetests/winmm/capture.c (with props) trunk/rostests/winetests/winmm/mci.c (with props) trunk/rostests/winetests/winmm/mixer.c (with props) trunk/rostests/winetests/winmm/mmio.c (with props) trunk/rostests/winetests/winmm/testlist.c (with props) trunk/rostests/winetests/winmm/timer.c (with props) trunk/rostests/winetests/winmm/wave.c (with props) trunk/rostests/winetests/winmm/winmm.rbuild (with props) trunk/rostests/winetests/winmm/winmm_test.h (with props) Modified: trunk/rostests/winetests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… Added: trunk/rostests/winetests/winmm/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/capture.c… Added: trunk/rostests/winetests/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mci.c?rev… Added: trunk/rostests/winetests/winmm/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mixer.c?r… Added: trunk/rostests/winetests/winmm/mmio.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mmio.c?re… Added: trunk/rostests/winetests/winmm/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/testlist.… Added: trunk/rostests/winetests/winmm/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/timer.c?r… Added: trunk/rostests/winetests/winmm/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/wave.c?re… Added: trunk/rostests/winetests/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/winmm.rbu… Added: trunk/rostests/winetests/winmm/winmm_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/winmm_tes…

1 0

[khornicek] 43810: - sync ddraw with trunk - if anyone wishes to work on it, do it in this branch please
by khornicek＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: khornicek Date: Wed Oct 28 14:23:03 2009 New Revision: 43810 URL: http://svn.reactos.org/svn/reactos?rev=43810&view=rev Log: - sync ddraw with trunk - if anyone wishes to work on it, do it in this branch please Added: branches/reactx/reactos/dll/directx/ddraw/ddraw.spec (with props) Removed: branches/reactx/reactos/dll/directx/ddraw/ddraw.def Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_stubs.c branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild branches/reactx/reactos/dll/directx/ddraw/main.c branches/reactx/reactos/dll/directx/ddraw/rosdraw.h Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -133,7 +133,7 @@ * @name DDraw->AddRef * @implemented * -* The function DDraw->AddRef count of all ref counter in the COM object DDraw-> +* The function DDraw->AddRef manages all ref counters in the COM object DDraw-> * @return * Returns the local Ref counter value for the COM object @@ -149,20 +149,20 @@ DX_WINDBG_trace(); - /* Lock the thread so nothing can change the COM while we updating it */ + /* Lock the thread */ AcquireDDThreadLock(); _SEH2_TRY { - /* Count up the internal ref counter */ + /* Increment the internal ref counter */ This->dwIntRefCnt++; - /* Count up the internal local ref counter */ + /* Increment the local internal ref counter */ This->lpLcl->dwLocalRefCnt++; if (This->lpLcl->lpGbl != NULL) { - /* Count up the internal gobal ref counter */ + /* Increment the gobal internal ref counter */ This->lpLcl->lpGbl->dwRefCnt++; } } @@ -198,7 +198,7 @@ DX_WINDBG_trace(); - /* Lock the thread so nothing can change the COM while we updating it */ + /* Lock the thread */ AcquireDDThreadLock(); _SEH2_TRY @@ -255,14 +255,13 @@ * @name DDraw->Compact * @implemented * -* The function DDraw->Compact only return two diffent return value, they are DD_OK and DERR_NOEXCLUSIVEMODE -* if we are in Exclusive mode we return DERR_NOEXCLUSIVEMODE, other wise we return DD_OK - +* In exlusive mode the function DDraw->Compact returns DERR_NOEXCLUSIVEMODE, otherwise it returns DD_OK +* * @return -* Returns only Error code DD_OK or DERR_NOEXCLUSIVEMODE +* Returns only error code DD_OK or DERR_NOEXCLUSIVEMODE * * @remarks. -* Microsoft say Compact is not implement in ddraw.dll, but Compact return DDERR_NOEXCLUSIVEMODE or DD_OK +* Microsoft says Compact is not implemented in ddraw.dll, but it returns DDERR_NOEXCLUSIVEMODE or DD_OK * *--*/ HRESULT WINAPI @@ -272,12 +271,12 @@ DX_WINDBG_trace(); - /* Lock the thread so nothing can change the COM while we updating it */ + /* Lock the thread */ AcquireDDThreadLock(); _SEH2_TRY { - /* Check see if Exclusive mode have been activate */ + /* Check if Exclusive mode has been activated */ if (This->lpLcl->lpGbl->lpExclusiveOwner != This->lpLcl) { retVal = DDERR_NOEXCLUSIVEMODE; Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -102,7 +102,7 @@ _SEH2_LEAVE; } - if( (GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD) ) + if( (GetWindowLongPtr(hwnd, GWL_STYLE) & WS_CHILD) ) { retVal = DDERR_INVALIDPARAMS; _SEH2_LEAVE; Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -1,12 +1,13 @@ /* $Id$ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS DirectX -* FILE: ddraw/surface/callbacks_surf_hel.c -* PURPOSE: HEL Callbacks For Surface APIs -* PROGRAMMER: Magnus Olsen -* -*/ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/callbacks_surf_hel.c + * PURPOSE: HEL Callbacks For Surface APIs + * PROGRAMMER: Magnus Olsen + * + */ + #include "rosdraw.h" DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface) @@ -78,12 +79,12 @@ DX_WINDBG_trace(); - /* ToDo tell ddraw internal this surface are locked */ + /* ToDo tell ddraw internal this surface is locked */ /* ToDo add support for dwFlags */ - /* Get our hdc for the active windows */ - hDC = GetDC(lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); + /* Get our hdc for the active window */ + hDC = GetDC((HWND)lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); if (hDC != NULL) { @@ -91,7 +92,6 @@ if (!lpLockData->bHasRect) { - hImage = CreateCompatibleBitmap (hDC, lpLockData->lpDDSurface->lpGbl->wWidth, lpLockData->lpDDSurface->lpGbl->wHeight); } else @@ -121,7 +121,7 @@ SelectObject (hMemDC, hDCBmp); - /* Alloc memory buffer at usermode for the bitmap pixel data */ + /* Allocate memory buffer for the bitmap pixel data */ cbBuffer = bm.bmWidthBytes * bm.bmHeight ; pixels = (PDWORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbBuffer ); @@ -130,7 +130,7 @@ /* Get the bitmap bits */ GetBitmapBits(hImage,cbBuffer,pixels); - /* Fixme HACK check which member that store the hel bitmap buffer */ + /* Fixme HACK - check which member stores the HEL bitmap buffer */ lpLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2 = pixels; /* Setup return value */ @@ -164,10 +164,7 @@ DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr) { - /* - This api is not doucment by MS So I leave it - as stub. - */ + /* This api is not doucmented by MS, keep it stubbed */ DX_STUB; } @@ -202,8 +199,8 @@ DX_WINDBG_trace(); - /* Get our hdc for the active windows */ - hDC = GetDC(lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); + /* Get our hdc for the active window */ + hDC = GetDC((HWND)lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); if (hDC != NULL) { Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -35,7 +35,7 @@ DWORD count; HRESULT ret; - if ( (pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) != DDRAWILCL_SETCOOPCALLED) + if((pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) != DDRAWILCL_SETCOOPCALLED) { return DDERR_NOCOOPERATIVELEVELSET; } @@ -67,7 +67,7 @@ } else if(((pDDSD->dwFlags & DDSD_HEIGHT) || (pDDSD->dwFlags & DDSD_WIDTH)) - && (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + && (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) { return DDERR_INVALIDPARAMS; } Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -11,7 +11,6 @@ #include "rosdraw.h" - /* FIXME adding hal and hel stub DestroySurface; SetClipList; @@ -305,11 +304,11 @@ if (mDdBlt.Blt == NULL) { - /* This api are unsupported */ + /* This API is unsupported */ return DDERR_UNSUPPORTED; } - /* Prepare for draw, if we do not rest the DdResetVisrgn some graphice card will not draw on the screen */ + /* Prepare for draw, if we do not reset the DdResetVisrgn some graphics card will not draw on the screen */ if (!DdResetVisrgn( ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) { DX_STUB_str("DdResetVisrgn failed"); @@ -340,7 +339,7 @@ } /* FIXME - * compare so we do not write to far + * compare so we do not write too far * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp @@ -363,7 +362,7 @@ } /* FIXME - * compare so we do not write to far + * compare so we do not write too far * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -260,7 +260,7 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) + if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY)) { return DDERR_GENERIC; } Removed: branches/reactx/reactos/dll/directx/ddraw/ddraw.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.def (removed) @@ -1,23 +1,0 @@ -EXPORTS -AcquireDDThreadLock@0 -D3DParseUnknownCommand@8 -ReleaseDDThreadLock@0 - -;CompleteCreateSysmemSurface -;DDGetAttachedSurfaceLcl@12 -;DDInternalLock@8 -;DDInternalUnlock@4 -;DSoundHelp@12 -DirectDrawCreate@12 -DirectDrawCreateClipper@12 -DirectDrawCreateEx@16 -DirectDrawEnumerateA@8 -DirectDrawEnumerateW@8 -DirectDrawEnumerateExA@12 -DirectDrawEnumerateExW@12 -;DllCanUnloadNow -;DllGetClassObject -;GetDDSurfaceLocal@12 -;GetOLEThunkData -;GetSurfaceFromDC@12 -;RegisterSpecialCase Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes"> - <importlibrary definition="ddraw.def" /> +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" unicode="yes" crt="msvcrt"> + <importlibrary definition="ddraw.spec" /> <include base="ddraw">.</include> <library>kernel32</library> <library>user32</library> @@ -71,5 +71,5 @@ <file>DirectD3D7_Vtable.c</file> </directory>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Added: branches/reactx/reactos/dll/directx/ddraw/ddraw.spec URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.spec (added) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.spec [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -1,0 +1,21 @@ +@ stdcall AcquireDDThreadLock() +@ stdcall D3DParseUnknownCommand(ptr ptr) +@ stdcall ReleaseDDThreadLock() +#@ stdcall CompleteCreateSysmemSurface +#@ stdcall DDGetAttachedSurfaceLcl@12 +#@ stdcall DDInternalLock@8 +#@ stdcall DDInternalUnlock@4 +#@ stdcall DSoundHelp@12 +@ stdcall DirectDrawCreate(ptr ptr ptr) +@ stdcall DirectDrawCreateClipper(long ptr ptr) +@ stdcall DirectDrawCreateEx(ptr ptr ptr ptr) +@ stdcall DirectDrawEnumerateA(ptr ptr) +@ stdcall DirectDrawEnumerateW(ptr ptr) +@ stdcall DirectDrawEnumerateExA(ptr ptr long) +@ stdcall DirectDrawEnumerateExW(ptr ptr long) +#@ stdcall DllCanUnloadNow() +#@ stdcall DllGetClassObject(ptr ptr ptr) +#@ stdcall GetDDSurfaceLocal +#@ stdcall GetOLEThunkData +#@ stdcall GetSurfaceFromDC +#@ stdcall RegisterSpecialCase Propchange: branches/reactx/reactos/dll/directx/ddraw/ddraw.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/main.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -23,8 +23,8 @@ LPVOID lpContext; } DirectDrawEnumerateProcData; -BOOL -CALLBACK +BOOL +CALLBACK TranslateCallbackA(GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, @@ -177,8 +177,8 @@ return retVal; } -HRESULT -WINAPI +HRESULT +WINAPI DirectDrawEnumerateA( LPDDENUMCALLBACKA lpCallback, LPVOID lpContext) { @@ -294,7 +294,7 @@ for more info about this command see msdn documentation - The buffer start with D3DHAL_DP2COMMAND struct afer that follows either one struct or + The buffer start with D3DHAL_DP2COMMAND struct afer that follows either one struct or no struct at at all example for command D3DDP2OP_VIEWPORTINFO Modified: branches/reactx/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -1,14 +1,8 @@ #ifndef __DDRAW_PRIVATE #define __DDRAW_PRIVATE -#define WIN32_NO_STATUS -#define NTOS_MODE_USER - /********* Includes *********/ #include <windows.h> -#include <ndk/ntndk.h> - - #include <stdio.h> #include <ddraw.h> #include <ddrawi.h>

1 0

[fireball] 43809: [fastfat_new] - Implement overwrite/supersede operations on an existing FCB, no on-disk writing yet.
by fireball＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: fireball Date: Wed Oct 28 12:29:34 2009 New Revision: 43809 URL: http://svn.reactos.org/svn/reactos?rev=43809&view=rev Log: [fastfat_new] - Implement overwrite/supersede operations on an existing FCB, no on-disk writing yet. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Wed Oct 28 12:29:34 2009 @@ -115,6 +115,113 @@ /* Return status */ return Error; +} + +IO_STATUS_BLOCK +NTAPI +FatiOverwriteFile(PFAT_IRP_CONTEXT IrpContext, + PFILE_OBJECT FileObject, + PFCB Fcb, + ULONG AllocationSize, + PFILE_FULL_EA_INFORMATION EaBuffer, + ULONG EaLength, + UCHAR FileAttributes, + ULONG CreateDisposition, + BOOLEAN NoEaKnowledge) +{ + IO_STATUS_BLOCK Iosb = {{0}}; + PCCB Ccb; + LARGE_INTEGER Zero; + ULONG NotifyFilter; + + Zero.QuadPart = 0; + + /* Check Ea mismatch first */ + if (NoEaKnowledge && EaLength > 0) + { + Iosb.Status = STATUS_ACCESS_DENIED; + return Iosb; + } + + do + { + /* Check if it's not still mapped */ + if (!MmCanFileBeTruncated(&Fcb->SectionObjectPointers, + &Zero)) + { + /* Fail */ + Iosb.Status = STATUS_USER_MAPPED_FILE; + break; + } + + /* Set file object pointers */ + Ccb = FatCreateCcb(); + FatSetFileObject(FileObject, + UserFileOpen, + Fcb, + Ccb); + + FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + + /* Indicate that create is in progress */ + Fcb->Vcb->State |= VCB_STATE_CREATE_IN_PROGRESS; + + /* Purge the cache section */ + CcPurgeCacheSection(&Fcb->SectionObjectPointers, NULL, 0, FALSE); + + /* Add Eas */ + if (EaLength > 0) + { + ASSERT(FALSE); + } + + /* Acquire the paging resource */ + (VOID)ExAcquireResourceExclusiveLite(Fcb->Header.PagingIoResource, TRUE); + + /* Initialize FCB header */ + Fcb->Header.FileSize.QuadPart = 0; + Fcb->Header.ValidDataLength.QuadPart = 0; + + /* Let CC know about changed file size */ + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->Header.AllocationSize); + + // TODO: Actually truncate the file + DPRINT1("TODO: Actually truncate the file with a fullfat handle %x\n", Fcb->FatHandle); + + /* Release the paging resource */ + ExReleaseResourceLite(Fcb->Header.PagingIoResource); + + /* Specify truncate on close */ + Fcb->State |= FCB_STATE_TRUNCATE_ON_CLOSE; + + // TODO: Delete previous EA if needed + + /* Send notification about changes */ + NotifyFilter = FILE_NOTIFY_CHANGE_LAST_WRITE | + FILE_NOTIFY_CHANGE_ATTRIBUTES | + FILE_NOTIFY_CHANGE_SIZE; + + FsRtlNotifyFullReportChange(Fcb->Vcb->NotifySync, + &Fcb->Vcb->NotifyList, + (PSTRING)&Fcb->FullFileName, + Fcb->FullFileName.Length - Fcb->FileNameLength, + NULL, + NULL, + NotifyFilter, + FILE_ACTION_MODIFIED, + NULL); + + /* Set success status */ + Iosb.Status = STATUS_SUCCESS; + + /* Set correct information code */ + Iosb.Information = (CreateDisposition == FILE_SUPERSEDE) ? FILE_SUPERSEDED : FILE_OVERWRITTEN; + } while (0); + + /* Remove the create in progress flag */ + ClearFlag(Fcb->Vcb->State, VCB_STATE_CREATE_IN_PROGRESS); + + return Iosb; } IO_STATUS_BLOCK Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Wed Oct 28 12:29:34 2009 @@ -94,6 +94,18 @@ IN BOOLEAN DeleteOnClose); /* -------------------------------------------------------- create.c */ + +IO_STATUS_BLOCK +NTAPI +FatiOverwriteFile(PFAT_IRP_CONTEXT IrpContext, + PFILE_OBJECT FileObject, + PFCB Fcb, + ULONG AllocationSize, + PFILE_FULL_EA_INFORMATION EaBuffer, + ULONG EaLength, + UCHAR FileAttributes, + ULONG CreateDisposition, + BOOLEAN NoEaKnowledge); NTSTATUS NTAPI FatCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Wed Oct 28 12:29:34 2009 @@ -248,10 +248,11 @@ FcbNeedsToBeVerified } FCB_CONDITION; -#define FCB_STATE_HAS_NAMES 0x01 -#define FCB_STATE_HAS_UNICODE_NAME 0x02 -#define FCB_STATE_PAGEFILE 0x04 -#define FCB_STATE_DELAY_CLOSE 0x08 +#define FCB_STATE_HAS_NAMES 0x01 +#define FCB_STATE_HAS_UNICODE_NAME 0x02 +#define FCB_STATE_PAGEFILE 0x04 +#define FCB_STATE_DELAY_CLOSE 0x08 +#define FCB_STATE_TRUNCATE_ON_CLOSE 0x10 typedef struct _FCB { Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Wed Oct 28 12:29:34 2009 @@ -195,7 +195,7 @@ BOOLEAN Hidden; BOOLEAN System; PCCB Ccb = NULL; - NTSTATUS Status; + NTSTATUS Status, StatusPrev; /* Acquire exclusive FCB lock */ (VOID)FatAcquireExclusiveFcb(IrpContext, Fcb); @@ -383,8 +383,27 @@ (CreateDisposition == FILE_OVERWRITE) || (CreateDisposition == FILE_OVERWRITE_IF)) { - UNIMPLEMENTED; - ASSERT(FALSE); + /* Remember previous status */ + StatusPrev = Iosb.Status; + + // TODO: Check system security access + + /* Perform overwrite operation */ + Iosb = FatiOverwriteFile(IrpContext, + FileObject, + Fcb, + AllocationSize, + EaBuffer, + EaLength, + FileAttributes, + CreateDisposition, + NoEaKnowledge); + + /* Restore previous status in case of success */ + if (Iosb.Status == STATUS_SUCCESS) + Iosb.Status = StatusPrev; + + /* Fall down to completion */ } else {

1 0

[cwittich] 43808: sync widl to wine 1.1.32
by cwittich＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: cwittich Date: Wed Oct 28 12:28:26 2009 New Revision: 43808 URL: http://svn.reactos.org/svn/reactos?rev=43808&view=rev Log: sync widl to wine 1.1.32 Modified: trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=4380… ============================================================================== --- trunk/reactos/tools/widl/hash.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/hash.c [iso-8859-1] Wed Oct 28 12:28:26 2009 @@ -636,4 +636,4 @@ nLoWord = (nLoWord % 65599) & 0xffff; return nHiWord | nLoWord; -} +} Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=4… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Wed Oct 28 12:28:26 2009 @@ -482,7 +482,7 @@ /* ref pointers cannot just be block copied. unique pointers to * interfaces need special treatment. either case means the array is * complex */ - if (get_pointer_fc(elem_type, NULL, FALSE) == RPC_FC_RP) + if (get_pointer_fc(elem_type, NULL, FALSE) == RPC_FC_RP || pointer_size != 4) fc = RPC_FC_BOGUS_ARRAY; break; case TGT_BASIC: @@ -529,8 +529,7 @@ case TGT_POINTER: return TRUE; case TGT_ARRAY: - /* FIXME: array can be pointer */ - return type_has_pointers(type_array_get_element(type)); + return type_array_is_decl_as_ptr(type) || type_has_pointers(type_array_get_element(type)); case TGT_STRUCT: { var_list_t *fields = type_struct_get_fields(type); @@ -1574,6 +1573,30 @@ error("Unsupported member type %d\n", type_get_type(type)); } +static void write_array_element_type(FILE *file, const type_t *type, + int cont_is_complex, unsigned int *tfsoff) +{ + type_t *elem = type_array_get_element(type); + + if (!is_embedded_complex(elem) && is_ptr(elem)) + { + type_t *ref = type_pointer_get_ref(elem); + + if (processed(ref)) + { + write_nonsimple_pointer(file, NULL, elem, FALSE, ref->typestring_offset, tfsoff); + return; + } + if (!is_string_type(NULL, elem) && + (type_get_type(ref) == TYPE_BASIC || type_get_type(ref) == TYPE_ENUM)) + { + *tfsoff += write_simple_pointer(file, NULL, elem, FALSE); + return; + } + } + return write_member_type(file, type, cont_is_complex, NULL, elem, NULL, tfsoff); +} + static void write_end(FILE *file, unsigned int *tfsoff) { if (*tfsoff % 2 == 0) @@ -1615,7 +1638,7 @@ } } -static int write_no_repeat_pointer_descriptions( +static int write_pointer_description_offsets( FILE *file, const attr_list_t *attrs, type_t *type, unsigned int *offset_in_memory, unsigned int *offset_in_buffer, unsigned int *typestring_offset) @@ -1623,25 +1646,39 @@ int written = 0; unsigned int align; - if (is_ptr(type) || - (is_conformant_array(type) && type_array_is_decl_as_ptr(type))) - { - unsigned int memsize; - - print_file(file, 2, "0x%02x, /* FC_NO_REPEAT */\n", RPC_FC_NO_REPEAT); - print_file(file, 2, "0x%02x, /* FC_PAD */\n", RPC_FC_PAD); - - /* pointer instance */ - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer); - *typestring_offset += 6; + if ((is_ptr(type) && type_get_type(type_pointer_get_ref(type)) != TYPE_INTERFACE) || + (is_array(type) && type_array_is_decl_as_ptr(type))) + { + if (offset_in_memory && offset_in_buffer) + { + unsigned int memsize; + + /* pointer instance */ + /* FIXME: sometimes from end of structure, sometimes from beginning */ + print_file(file, 2, "NdrFcShort(0x%hx),\t/* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); + print_file(file, 2, "NdrFcShort(0x%hx),\t/* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer); + + align = 0; + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; + } + *typestring_offset += 4; if (is_ptr(type)) { + type_t *ref = type_pointer_get_ref(type); + if (is_string_type(attrs, type)) write_string_tfs(file, attrs, type, FALSE, NULL, typestring_offset); + else if (processed(ref)) + write_nonsimple_pointer(file, attrs, type, FALSE, ref->typestring_offset, typestring_offset); + else if (type_get_type(ref) == TYPE_BASIC || type_get_type(ref) == TYPE_ENUM) + *typestring_offset += write_simple_pointer(file, attrs, type, FALSE); else - write_pointer_tfs(file, attrs, type, FALSE, typestring_offset); + error("write_pointer_description_offsets: type format string unknown\n"); } else { @@ -1653,14 +1690,69 @@ write_nonsimple_pointer(file, attrs, type, FALSE, offset, typestring_offset); } - align = 0; - memsize = type_memsize(type, &align); - *offset_in_memory += memsize; - /* increment these separately as in the case of conformant (varying) - * structures these start at different values */ - *offset_in_buffer += memsize; - return 1; + } + + if (is_array(type)) + { + return write_pointer_description_offsets( + file, attrs, type_array_get_element(type), offset_in_memory, + offset_in_buffer, typestring_offset); + } + else if (is_non_complex_struct(type)) + { + /* otherwise search for interesting fields to parse */ + const var_t *v; + LIST_FOR_EACH_ENTRY( v, type_struct_get_fields(type), const var_t, entry ) + { + if (offset_in_memory && offset_in_buffer) + { + unsigned int padding; + align = 0; + type_memsize(v->type, &align); + padding = ROUNDING(*offset_in_memory, align); + *offset_in_memory += padding; + *offset_in_buffer += padding; + } + written += write_pointer_description_offsets( + file, v->attrs, v->type, offset_in_memory, offset_in_buffer, + typestring_offset); + } + } + else + { + if (offset_in_memory && offset_in_buffer) + { + unsigned int memsize; + align = 0; + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; + } + } + + return written; +} + +static int write_no_repeat_pointer_descriptions( + FILE *file, const attr_list_t *attrs, type_t *type, + unsigned int *offset_in_memory, unsigned int *offset_in_buffer, + unsigned int *typestring_offset) +{ + int written = 0; + unsigned int align; + + if (is_ptr(type) || + (is_conformant_array(type) && type_array_is_decl_as_ptr(type))) + { + print_file(file, 2, "0x%02x, /* FC_NO_REPEAT */\n", RPC_FC_NO_REPEAT); + print_file(file, 2, "0x%02x, /* FC_PAD */\n", RPC_FC_PAD); + *typestring_offset += 2; + + return write_pointer_description_offsets(file, attrs, type, + offset_in_memory, offset_in_buffer, typestring_offset); } if (is_non_complex_struct(type)) @@ -1696,89 +1788,6 @@ return written; } -static int write_pointer_description_offsets( - FILE *file, const attr_list_t *attrs, type_t *type, - unsigned int *offset_in_memory, unsigned int *offset_in_buffer, - unsigned int *typestring_offset) -{ - int written = 0; - unsigned int align; - - if (is_ptr(type) && type_get_type(type_pointer_get_ref(type)) != TYPE_INTERFACE) - { - type_t *ref = type_pointer_get_ref(type); - - if (offset_in_memory && offset_in_buffer) - { - unsigned int memsize; - - /* pointer instance */ - /* FIXME: sometimes from end of structure, sometimes from beginning */ - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer); - - align = 0; - memsize = type_memsize(type, &align); - *offset_in_memory += memsize; - /* increment these separately as in the case of conformant (varying) - * structures these start at different values */ - *offset_in_buffer += memsize; - } - *typestring_offset += 4; - - if (is_string_type(attrs, type)) - write_string_tfs(file, attrs, type, FALSE, NULL, typestring_offset); - else if (processed(ref) || type_get_type(ref) == TYPE_BASIC || type_get_type(ref) == TYPE_ENUM) - write_pointer_tfs(file, attrs, type, FALSE, typestring_offset); - else - error("write_pointer_description_offsets: type format string unknown\n"); - - return 1; - } - - if (is_array(type)) - { - return write_pointer_description_offsets( - file, attrs, type_array_get_element(type), offset_in_memory, - offset_in_buffer, typestring_offset); - } - else if (is_non_complex_struct(type)) - { - /* otherwise search for interesting fields to parse */ - const var_t *v; - LIST_FOR_EACH_ENTRY( v, type_struct_get_fields(type), const var_t, entry ) - { - if (offset_in_memory && offset_in_buffer) - { - unsigned int padding; - align = 0; - type_memsize(v->type, &align); - padding = ROUNDING(*offset_in_memory, align); - *offset_in_memory += padding; - *offset_in_buffer += padding; - } - written += write_pointer_description_offsets( - file, v->attrs, v->type, offset_in_memory, offset_in_buffer, - typestring_offset); - } - } - else - { - if (offset_in_memory && offset_in_buffer) - { - unsigned int memsize; - align = 0; - memsize = type_memsize(type, &align); - *offset_in_memory += memsize; - /* increment these separately as in the case of conformant (varying) - * structures these start at different values */ - *offset_in_buffer += memsize; - } - } - - return written; -} - /* Note: if file is NULL return value is number of pointers to write, else * it is the number of type format characters written */ static int write_fixed_array_pointer_descriptions( @@ -1935,7 +1944,7 @@ *typestring_offset += 8; pointer_count = write_pointer_description_offsets( - file, attrs, type, offset_in_memory, + file, attrs, type_array_get_element(type), offset_in_memory, offset_in_buffer, typestring_offset); } } @@ -2228,7 +2237,7 @@ *typestring_offset += 1; } - write_member_type(file, type, FALSE, NULL, type_array_get_element(type), NULL, typestring_offset); + write_array_element_type(file, type, FALSE, typestring_offset); write_end(file, typestring_offset); } else @@ -2242,7 +2251,8 @@ *typestring_offset += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is); - write_member_type(file, type, TRUE, NULL, type_array_get_element(type), NULL, typestring_offset); + + write_array_element_type(file, type, TRUE, typestring_offset); write_end(file, typestring_offset); } @@ -4053,7 +4063,7 @@ fprintf( file, "#undef RpcAbnormalTermination\n"); fprintf( file, "\n"); fprintf( file, "struct __exception_frame;\n"); - fprintf( file, "typedef int (*__filter_func)(EXCEPTION_RECORD *, struct __exception_frame *);\n"); + fprintf( file, "typedef int (*__filter_func)(struct __exception_frame *);\n"); fprintf( file, "typedef void (*__finally_func)(struct __exception_frame *);\n"); fprintf( file, "\n"); fprintf( file, "#define __DECL_EXCEPTION_FRAME \\\n"); @@ -4100,7 +4110,7 @@ fprintf( file, " return ExceptionContinueSearch;\n"); fprintf( file, " }\n" ); fprintf( file, " exc_frame->code = record->ExceptionCode;\n"); - fprintf( file, " if (exc_frame->filter_level && exc_frame->filter( record, exc_frame ) == EXCEPTION_EXECUTE_HANDLER)\n" ); + fprintf( file, " if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER)\n" ); fprintf( file, " __wine_rtl_unwind( frame, record, __widl_unwind_target );\n"); fprintf( file, " return ExceptionContinueSearch;\n"); fprintf( file, "}\n");

1 0

[janderwald] 43807: Add StringFromIID prototype
by janderwald＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: janderwald Date: Wed Oct 28 12:19:25 2009 New Revision: 43807 URL: http://svn.reactos.org/svn/reactos?rev=43807&view=rev Log: Add StringFromIID prototype Modified: trunk/reactos/include/psdk/objbase.h Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Wed Oct 28 12:19:25 2009 @@ -510,6 +510,7 @@ const WCHAR* pwcsTemplateFile; } STGOPTIONS; +HRESULT WINAPI StringFromIID(REFIID rclsid, LPOLESTR *lplpsz); HRESULT WINAPI StgCreateDocfile(LPCOLESTR pwcsName,DWORD grfMode,DWORD reserved,IStorage **ppstgOpen); HRESULT WINAPI StgCreateStorageEx(const WCHAR*,DWORD,DWORD,DWORD,STGOPTIONS*,void*,REFIID,void**); HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn);

1 0

[fireball] 43806: [fastfat_new] - FatCreateCcb takes no parameters, so don't pass any. Spotted by Stefan's msvc.
by fireball＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: fireball Date: Wed Oct 28 11:18:57 2009 New Revision: 43806 URL: http://svn.reactos.org/svn/reactos?rev=43806&view=rev Log: [fastfat_new] - FatCreateCcb takes no parameters, so don't pass any. Spotted by Stefan's msvc. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Wed Oct 28 11:18:57 2009 @@ -67,7 +67,7 @@ } /* Set file object pointers */ - Ccb = FatCreateCcb(IrpContext); + Ccb = FatCreateCcb(); FatSetFileObject(FileObject, UserDirectoryOpen, Dcb, Ccb); /* Increment counters */ @@ -336,7 +336,7 @@ } /* Set file object pointers */ - Ccb = FatCreateCcb(IrpContext); + Ccb = FatCreateCcb(); FatSetFileObject(FileObject, UserVolumeOpen, Vcb, Ccb); FileObject->SectionObjectPointer = &Vcb->SectionObjectPointers; Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Wed Oct 28 11:18:57 2009 @@ -367,7 +367,7 @@ } /* Set up file object */ - Ccb = FatCreateCcb(IrpContext); + Ccb = FatCreateCcb(); FatSetFileObject(FileObject, UserFileOpen, Fcb,

1 0

[cwittich] 43805: add ac97 as optional
by cwittich＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: cwittich Date: Wed Oct 28 11:16:17 2009 New Revision: 43805 URL: http://svn.reactos.org/svn/reactos?rev=43805&view=rev Log: add ac97 as optional Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Oct 28 11:16:17 2009 @@ -670,6 +670,8 @@ modules\optional\netkvm2k.inf 6 optional modules\optional\netkvm2k.cat 6 optional modules\optional\netkvm.sys 2 optional +modules\optional\alcxwdm.inf 6 optional +modules\optional\alcxwdm.sys 2 optional modules\optional\mfc42.dll 1 optional modules\optional\mfc42u.dll 1 optional modules\optional\mfc71.dll 1 optional

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