Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mbosma] 26793: Some formatting and implement SetDisplayMode.
by mbosma＠svn.reactos.org 15 May '07

15 May '07

Author: mbosma Date: Tue May 15 20:18:30 2007 New Revision: 26793 URL: http://svn.reactos.org/svn/reactos?rev=26793&view=rev Log: Some formatting and implement SetDisplayMode. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Tue May 15 20:18:30 2007 @@ -9,7 +9,7 @@ */ -#include "../rosdraw.h" +#include "rosdraw.h" HRESULT WINAPI @@ -117,6 +117,65 @@ return DD_OK; } +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + // FIXME: Check primary if surface is locked / busy etc. + + // Check Parameter + if(dwFlags != 0) + { + return DDERR_INVALIDPARAMS; + } + + if ((!dwHeight || This->lpLcl->lpGbl->vmiData.dwDisplayHeight == dwHeight) && + (!dwWidth || This->lpLcl->lpGbl->vmiData.dwDisplayWidth == dwWidth) && + (!dwBPP || This->lpLcl->lpGbl->vmiData.ddpfDisplay.dwRGBBitCount == dwBPP) && + (!dwRefreshRate || This->lpLcl->lpGbl->dwMonitorFrequency == dwRefreshRate)) + { + return DD_OK; // nothing to do here for us + } + + // Here we go + DEVMODE DevMode; + DevMode.dmFields = 0; + if(dwHeight) + DevMode.dmFields |= DM_PELSHEIGHT; + if(dwWidth) + DevMode.dmFields |= DM_PELSWIDTH; + if(dwBPP) + DevMode.dmFields |= DM_BITSPERPEL; + if(dwRefreshRate) + DevMode.dmFields |= DM_DISPLAYFREQUENCY; + + DevMode.dmPelsHeight = dwHeight; + DevMode.dmPelsWidth = dwWidth; + DevMode.dmBitsPerPel = dwBPP; + DevMode.dmDisplayFrequency = dwRefreshRate; + + LONG retval = ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN /* | CDS_SET_PRIMARY ? */); + DbgPrint("%d\n", retval); + + if(retval == DISP_CHANGE_BADMODE) + { + return DDERR_UNSUPPORTED; + } + else if(retval != DISP_CHANGE_SUCCESSFUL) + { + return DDERR_GENERIC; + } + + // Update Interals + BOOL ModeChanged; + DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); + StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); + + return DD_OK; +} /* */ Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Tue May 15 20:18:30 2007 @@ -8,7 +8,7 @@ * */ -#include "../rosdraw.h" +#include "rosdraw.h" /* * Status: Implentation removed due to rewrite @@ -148,17 +148,6 @@ * Status: Implentation removed due to rewrite */ HRESULT WINAPI -Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Status: Implentation removed due to rewrite - */ -HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) { Modified: trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c Tue May 15 20:18:30 2007 @@ -8,11 +8,7 @@ * */ -#include <windows.h> #include "rosdraw.h" -#include "d3dhal.h" -#include "ddrawgdi.h" - DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface) { Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Tue May 15 20:18:30 2007 @@ -93,7 +93,6 @@ RtlCopyMemory(dst_pDesc,src_pDesc,sizeof(DDSURFACEDESC)); dst_pDesc->dwSize = sizeof(DDSURFACEDESC2); } - HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Tue May 15 20:18:30 2007 @@ -8,7 +8,7 @@ * */ -#include "../rosdraw.h" +#include "rosdraw.h" /* FIXME adding hal and hel stub Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c Tue May 15 20:18:30 2007 @@ -8,7 +8,7 @@ * */ -#include "../rosdraw.h" +#include "rosdraw.h" HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue May 15 20:18:30 2007 @@ -358,7 +358,6 @@ StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable) { - LPDWORD mpFourCC; DDHALINFO mHALInfo; BOOL newmode = FALSE; @@ -367,6 +366,8 @@ D3DHAL_GLOBALDRIVERDATA mD3dDriverData; DDHAL_DDEXEBUFCALLBACKS mD3dBufferCallbacks; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + + DX_WINDBG_trace(); RtlZeroMemory(&mHALInfo, sizeof(DDHALINFO)); RtlZeroMemory(&mD3dCallbacks, sizeof(D3DHAL_CALLBACKS));

1 0

[fireball] 26792: - Revert rpcrt4 update, too buggy for now. My apologizes.
by fireball＠svn.reactos.org 15 May '07

15 May '07

Author: fireball Date: Tue May 15 16:12:42 2007 New Revision: 26792 URL: http://svn.reactos.org/svn/reactos?rev=26792&view=rev Log: - Revert rpcrt4 update, too buggy for now. My apologizes. Added: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c - copied unchanged from r26788, trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h - copied unchanged from r26788, trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h trunk/reactos/dll/win32/rpcrt4/ndr_midl.c - copied unchanged from r26788, trunk/reactos/dll/win32/rpcrt4/ndr_midl.c Removed: trunk/reactos/dll/win32/rpcrt4/epm_towers.h trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/cpsf.c trunk/reactos/dll/win32/rpcrt4/cpsf.h trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_misc.h trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_defs.h trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_message.h trunk/reactos/dll/win32/rpcrt4/rpc_misc.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_server.h trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.c trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.c?re… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.h?re… Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r… Removed: trunk/reactos/dll/win32/rpcrt4/epm_towers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/epm_tower… Removed: trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_clien… Removed: trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_fullp… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_misc.… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_defs.… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_misc.… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Removed: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… Modified: trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcss_np_… Modified: trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcss_np_… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[fireball] 26790: - Make advapi32 compilable without CUNITs.
by fireball＠svn.reactos.org 15 May '07

15 May '07

Author: fireball Date: Tue May 15 15:21:09 2007 New Revision: 26790 URL: http://svn.reactos.org/svn/reactos?rev=26790&view=rev Log: - Make advapi32 compilable without CUNITs. Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c Tue May 15 15:21:09 2007 @@ -18,6 +18,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); #define MAX_GUID_STRING_LEN 39 + +BOOL STDCALL +AddAuditAccessAceEx(PACL pAcl, + DWORD dwAceRevision, + DWORD AceFlags, + DWORD dwAccessMask, + PSID pSid, + BOOL bAuditSuccess, + BOOL bAuditFailure); typedef struct RECORD {

1 0

[fireball] 26789: - Sync RPCRT4.dll to Wine-20070507 (recent release Wine 0.9.36). - Fix a couple of headers. - NOTE: I tested this rpcrt4 under ReactOS 0.3.1 and it boots normally. However, for future work, a wrapper library around winsock should be built, and a rpcrt4_ros.diff should be developer. Right now it's manually synced, and contains a few modifications (marked as #ifdef FIX_LATER in most cases). Also, I'm not going to do a proper vendor import of this library, because next sync will m
by fireball＠svn.reactos.org 15 May '07

15 May '07

Author: fireball Date: Tue May 15 15:19:12 2007 New Revision: 26789 URL: http://svn.reactos.org/svn/reactos?rev=26789&view=rev Log: - Sync RPCRT4.dll to Wine-20070507 (recent release Wine 0.9.36). - Fix a couple of headers. - NOTE: I tested this rpcrt4 under ReactOS 0.3.1 and it boots normally. However, for future work, a wrapper library around winsock should be built, and a rpcrt4_ros.diff should be developer. Right now it's manually synced, and contains a few modifications (marked as #ifdef FIX_LATER in most cases). Also, I'm not going to do a proper vendor import of this library, because next sync will most probably be autosync. In case of problems, it could be reverted. Added: trunk/reactos/dll/win32/rpcrt4/epm_towers.h trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c Removed: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h trunk/reactos/dll/win32/rpcrt4/ndr_midl.c Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/cpsf.c trunk/reactos/dll/win32/rpcrt4/cpsf.h trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_misc.h trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_defs.h trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_message.h trunk/reactos/dll/win32/rpcrt4/rpc_misc.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_server.h trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.c trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.h trunk/reactos/include/psdk/rpc.h trunk/reactos/include/psdk/sspi.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.c?re… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.h?re… Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r… Added: trunk/reactos/dll/win32/rpcrt4/epm_towers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/epm_tower… Added: trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_clien… Removed: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… Removed: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… Added: trunk/reactos/dll/win32/rpcrt4/ndr_fullpointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_fullp… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… Removed: trunk/reactos/dll/win32/rpcrt4/ndr_midl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_midl.… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_misc.… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_defs.… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_misc.… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Added: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… Modified: trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcss_np_… Modified: trunk/reactos/dll/win32/rpcrt4/rpcss_np_client.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcss_np_… Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=267… Modified: trunk/reactos/include/psdk/sspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sspi.h?rev=26… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[gedmurphy] 26788: Add a readme file. This is open to improvements / additions as my initial revision was a rather lazy effort. Translations should come after this version has been finalized (and when the main app has been converted for translation)
by gedmurphy＠svn.reactos.org 15 May '07

15 May '07

Author: gedmurphy Date: Tue May 15 12:24:49 2007 New Revision: 26788 URL: http://svn.reactos.org/svn/reactos?rev=26788&view=rev Log: Add a readme file. This is open to improvements / additions as my initial revision was a rather lazy effort. Translations should come after this version has been finalized (and when the main app has been converted for translation) Added: trunk/tools/RosTE/README.txt Modified: trunk/tools/RosTE/LICENSE.txt Modified: trunk/tools/RosTE/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/LICENSE.txt?rev=26788&… ============================================================================== --- trunk/tools/RosTE/LICENSE.txt (original) +++ trunk/tools/RosTE/LICENSE.txt Tue May 15 12:24:49 2007 @@ -1,7 +1,6 @@ - == ReactOS Test Environment v0.1 == - - The components of the ReactOS Test Environment are released under -the following licenses: + == ReactOS Test Environment v0.1 == + +The components of the ReactOS Test Environment are released under the following licenses: ReactOS Test Environment installer and any accompanying data - GPLv2. ReactOS QEmu Manager - GPLv2 @@ -9,7 +8,7 @@ KQEmu - GPLv2 VDK - GPLv2 - The respective licenses are detailed below +The respective licenses are detailed below Added: trunk/tools/RosTE/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/README.txt?rev=26788&v… ============================================================================== --- trunk/tools/RosTE/README.txt (added) +++ trunk/tools/RosTE/README.txt Tue May 15 12:24:49 2007 @@ -1,0 +1,79 @@ +== Introduction == + +RosTE is a Windows based test environment for both ReactOS testers and developers. +It aims to provide an official test environment in a similar fashion to RosBE. +It also aims to provide an environment which is quick and easy to setup, allowing +non-techs or newbies interested in the project to get up an running quickly, with +easy access to important features such as live debugging or quick mounting of the +VM image. + +RosTE encompasses the following key components: + +- ReactOS QEmu Manager 1.3 +This is a GUI front end to RosTE giving a high degree of versatility over the +virtual machine, with many other features added to ensure management of your +test environment is simple. + +- QEmu 0.9.0 +This is the latest QEmu virtual machine for Windows. It provides a reliable +and proven test bed for operating system development + +- KQEmu 1.3.0pre-11 +This is the latest offering of QEmu accelerator, a driver allowing the emulator +to run much faster, improving the performance of ReactOS significantly + +- VDK 3.2 +This is a virtual disk driver allowing quick mounting of your virtual machine +image, allowing it to appear as a regular drive on your Windows operating system. + + + +== Installation == + +Instalation is simple, just double click the installer, and follow the simple +instructions. Upon completion, the QEmu manager will appear. + + + +== Setup == + +Before your newly installed test environment is ready for use, you must configure +some vital settings. + +1. Creating a new VM image (recommended) +If you dont plan on using an existing image, you must setup a new image for use +with RosTE. Click on the tools tab, set the size of the image to your preferred +value (512 is recommended), ensure the format is vmdk and click create image +In the dialog, choose a save location (remember where you save this) and click save + +2. Setting paths +- Paths tab + If you choose to leave the install path as default (C:\Program Files\RosTE) + then you neednt worry about setting the QEmu and VDK paths, however if you + changed this, then you will need to re-associate your paths with your chosen + install location. + + Set the QEmu and VDK paths by clicking on the open dialog buttons and locating + the paths of the corresponding folders (<your path>/RosTE/QEmu and <your path>/RosTE/VDK) + +- Harddisk tab + Check the HDA setting and locate the path of your virtual machine image (ReactOS.vmdk) + +- CD-ROM tab + Ensure the CD-ROM setting is checked. + If you plan on booting ReactOS from the iso provided by RosBE, click on Image File + and enter the path of your default ReactOS source directory. This is where RosBE + will save the generated iso. Otherwise, point this image file to the file located on + your harddisk. + This setting can be changed to Host CD-ROM once you have an installed system, + allowing you to use your computers CD-ROM as the virtual machine CD-ROM + +- Tools tab + You must be an administrator to use the VDK feature. + Set this to the path of your virtual machine image (ReactOS.vmdk) + +3. Setup debugging +To setup live debugging, click the Debug tab and ensure Redirect to screen is +checked. This will setup a telnet session and stream the debug output to a window +provided by RosTE. Note, you must choose Debug at the first boot option to receive +debug information

1 0

[cwittich] 26787: changed some german translations
by cwittich＠svn.reactos.org 15 May '07

15 May '07

Author: cwittich Date: Tue May 15 05:49:17 2007 New Revision: 26787 URL: http://svn.reactos.org/svn/reactos?rev=26787&view=rev Log: changed some german translations Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Tue May 15 05:49:17 2007 @@ -27,8 +27,8 @@ BEGIN LTEXT "Willkommen beim ReactOS Setup Assistenten.", IDC_WELCOMETITLE, 115, 9, 189, 31 LTEXT "Dieser Assistent wird ReactOS auf Ihrem Computer installieren. "\ - "Der Assistent benötigt ein paar Informationen um ReactOS "\ - "zu installieren.", IDC_STATIC, 115, 50, 189, 100 + "Der Assistent benötigt einige Informationen um ReactOS "\ + "installieren zu können.", IDC_STATIC, 115, 50, 189, 100 LTEXT "Klicken Sie auf Weiter um fortzufahren.", IDC_STATIC, 115, 160, 189, 31 END @@ -38,13 +38,13 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Die ReactOS Programmierer wollen folgende Open Source Projekte anerkennen, "\ + LTEXT "Die ReactOS Programmierer möchten folgende Open Source Projekte anerkennen, "\ "die (teils) verwendet wurden, um ReactOS zu erstellen:", IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS ist unter der GPL veröffentlicht, wenn Sie also (Teile von) ReactOS wiederverwenden "\ - "oder wiederveröffentlichen wollen, müssen Sie die GPL respektieren.", + LTEXT "ReactOS ist unter der GPL veröffentlicht, wenn Sie (Teile von) ReactOS wiederverwenden "\ + "oder wiederveröffentlichen wollen, müssen Sie die Bestimmungen der GPL anerkennen.", IDC_STATIC,15,110,227,24 PUSHBUTTON "&GPL &ansehen...",IDC_VIEWGPL,251,110,50,19 LTEXT "Klicken Sie auf Weiter, um mit dem Setup fortzufahren.",IDC_STATIC,15,136, @@ -57,7 +57,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Geben Sie ihren Namen und ihre Firma oder Organisation ein.", + LTEXT "Bitte geben Sie Ihren Namen und den Namen Ihrer Firma ein.", IDC_STATIC, 54, 7, 242, 21 LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL @@ -71,7 +71,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Geben sie einen Computernamen ein, der höchstens 63 Zeichen lang ist. "\ + LTEXT "Bitte geben sie einen Computernamen ein (maximal 63 Zeichen). "\ "Wenn Sie im Netzwerk sind, muss dieser Name einmalig sein.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computername:", IDC_STATIC, 54, 38, 75, 8 @@ -170,7 +170,7 @@ IDS_OWNERTITLE "Personalisieren Sie ihre Software" IDS_OWNERSUBTITLE "Das Setup nutzt diese Informationen über Sie, um ReactOS zu personalisieren." IDS_COMPUTERTITLE "Computername und Administratorpasswort" - IDS_COMPUTERSUBTITLE "Sie müssen einen Namen und ein Adminstratorpasswort für ihren Computer festsetzen." + IDS_COMPUTERSUBTITLE "Sie müssen einen Namen und ein Adminstratorpasswort für ihren Computer festlegen." IDS_LOCALETITLE "Regionale Einstellungen" IDS_LOCALESUBTITLE "Sie können ReactOS auf unterschiedliche Regionen und Sprachen einstellen." IDS_DATETIMETITLE "Datum und Uhrzeit"

1 0

[hpoussin] 26786: One more fix for release build
by hpoussin＠svn.reactos.org 14 May '07

14 May '07

Author: hpoussin Date: Tue May 15 01:09:52 2007 New Revision: 26786 URL: http://svn.reactos.org/svn/reactos?rev=26786&view=rev Log: One more fix for release build Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Tue May 15 01:09:52 2007 @@ -22,9 +22,9 @@ #define NDEBUG #include <debug.h> -#ifdef DBG ULONG AllocationCount = 0; +#ifdef DBG VOID VerifyHeap(VOID); VOID DumpMemoryAllocMap(VOID); VOID IncrementAllocationCount(VOID);

1 0

[hpoussin] 26785: Try to fix release build
by hpoussin＠svn.reactos.org 14 May '07

14 May '07

Author: hpoussin Date: Tue May 15 00:28:26 2007 New Revision: 26785 URL: http://svn.reactos.org/svn/reactos?rev=26785&view=rev Log: Try to fix release build Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Tue May 15 00:28:26 2007 @@ -76,8 +76,10 @@ #else + inline VOID DebugPrint(ULONG Mask, char *format, ...) {} + #define DebugInit() - #define DbgPrint(_x_) { if (0) printf _x_; } + #define DbgPrint(_x_) { if (0) DebugPrint _x_; } #define DPRINT1(_x_) { if (0) printf _x_; } #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_)

1 0

[ion] 26784: - Re-organize regobj.c so that new APIs are at the bottom. - Make NtDeleteKey delete the key in-line instead of waiting for the Ob callback.
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Tue May 15 00:24:12 2007 New Revision: 26784 URL: http://svn.reactos.org/svn/reactos?rev=26784&view=rev Log: - Re-organize regobj.c so that new APIs are at the bottom. - Make NtDeleteKey delete the key in-line instead of waiting for the Ob callback. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Tue May 15 00:24:12 2007 @@ -489,9 +489,28 @@ } else { - /* Set the marked for delete bit in the key object */ - KeyObject->Flags |= KO_MARKED_FOR_DELETE; - Status = STATUS_SUCCESS; + PKEY_OBJECT ParentKeyObject = KeyObject->ParentKey; + + if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) + { + DPRINT1("Key not found in parent list ???\n"); + } + + CmiRemoveSubKey(KeyObject->RegistryHive, + ParentKeyObject, + KeyObject); + + KeQuerySystemTime (&ParentKeyObject->KeyCell->LastWriteTime); + HvMarkCellDirty(&ParentKeyObject->RegistryHive->Hive, + ParentKeyObject->KeyCellOffset); + + if (!IsNoFileHive (KeyObject->RegistryHive) || + !IsNoFileHive (ParentKeyObject->RegistryHive)) + { + CmiSyncHives (); + } + + Status = STATUS_SUCCESS; } /* Release hive lock */ @@ -521,6 +540,274 @@ * CmpDeleteKeyObject() (in regobj.c) after all key-related structures * have been released. */ + + return Status; +} + +NTSTATUS STDCALL +NtFlushKey(IN HANDLE KeyHandle) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + PEREGISTRY_HIVE RegistryHive; + KPROCESSOR_MODE PreviousMode; + + PAGED_CODE(); + + DPRINT("NtFlushKey (KeyHandle %lx) called\n", KeyHandle); + + PreviousMode = ExGetPreviousMode(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + 0, + CmpKeyObjectType, + PreviousMode, + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + VERIFY_KEY_OBJECT(KeyObject); + + RegistryHive = KeyObject->RegistryHive; + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + if (IsNoFileHive(RegistryHive)) + { + Status = STATUS_SUCCESS; + } + else + { + /* Flush non-volatile hive */ + Status = CmiFlushRegistryHive(RegistryHive); + } + + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + + ObDereferenceObject(KeyObject); + + return STATUS_SUCCESS; +} + + +NTSTATUS STDCALL +NtOpenKey(OUT PHANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) +{ + UNICODE_STRING RemainingPath; + KPROCESSOR_MODE PreviousMode; + PVOID Object = NULL; + HANDLE hKey = NULL; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; + REG_PRE_OPEN_KEY_INFORMATION PreOpenKeyInfo; + REG_POST_OPEN_KEY_INFORMATION PostOpenKeyInfo; + + PAGED_CODE(); + + DPRINT("NtOpenKey(KH 0x%p DA %x OA 0x%p OA->ON '%wZ'\n", + KeyHandle, + DesiredAccess, + ObjectAttributes, + ObjectAttributes ? ObjectAttributes->ObjectName : NULL); + + /* Check place for result handle, if it's null - return immediately */ + if (KeyHandle == NULL) + return(STATUS_INVALID_PARAMETER); + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeAndZeroHandle(KeyHandle); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + /* WINE checks for the length also */ + /*if (ObjectAttributes->ObjectName->Length > MAX_NAME_LENGTH) + return(STATUS_BUFFER_OVERFLOW);*/ + + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(ObjectAttributes, + PreviousMode, + FALSE, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + return Status; + } + + if (ObjectName.Buffer && + ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == '\\') + { + ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; + ObjectName.Length -= sizeof(WCHAR); + ObjectName.MaximumLength -= sizeof(WCHAR); + } + + PostOpenKeyInfo.CompleteName = &ObjectName; + PreOpenKeyInfo.CompleteName = &ObjectName; + Status = CmiCallRegisteredCallbacks(RegNtPreOpenKey, &PreOpenKeyInfo); + if (!NT_SUCCESS(Status)) + { + PostOpenKeyInfo.Object = NULL; + PostOpenKeyInfo.Status = Status; + CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); + return Status; + } + + + RemainingPath.Buffer = NULL; + + Status = CmFindObject(&ObjectCreateInfo, + &ObjectName, + (PVOID*)&Object, + &RemainingPath, + CmpKeyObjectType, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("CmpFindObject() returned 0x%08lx\n", Status); + Status = STATUS_INVALID_HANDLE; /* Because ObFindObject returns STATUS_UNSUCCESSFUL */ + goto openkey_cleanup; + } + + VERIFY_KEY_OBJECT((PKEY_OBJECT) Object); + + DPRINT("RemainingPath '%wZ'\n", &RemainingPath); + + if ((RemainingPath.Buffer != NULL) && (RemainingPath.Buffer[0] != 0)) + { + RtlFreeUnicodeString(&RemainingPath); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto openkey_cleanup; + } + + RtlFreeUnicodeString(&RemainingPath); + + /* Fail if the key has been deleted */ + if (((PKEY_OBJECT)Object)->Flags & KO_MARKED_FOR_DELETE) + { + Status = STATUS_UNSUCCESSFUL; + goto openkey_cleanup; + } + + Status = CmpCreateHandle(Object, + DesiredAccess, + ObjectCreateInfo.Attributes, + &hKey); + +openkey_cleanup: + + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + PostOpenKeyInfo.Object = NT_SUCCESS(Status) ? (PVOID)Object : NULL; + PostOpenKeyInfo.Status = Status; + CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); + if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); + + if (Object) + { + ObDereferenceObject(Object); + } + + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { + *KeyHandle = hKey; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; +} + +/* + * NOTE: + * KeyObjectAttributes->RootDirectory specifies the handle to the parent key and + * KeyObjectAttributes->Name specifies the name of the key to load. + * Flags can be 0 or REG_NO_LAZY_FLUSH. + */ +NTSTATUS STDCALL +NtLoadKey2 (IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN POBJECT_ATTRIBUTES FileObjectAttributes, + IN ULONG Flags) +{ + NTSTATUS Status; + PAGED_CODE(); + DPRINT ("NtLoadKey2() called\n"); + +#if 0 + if (!SeSinglePrivilegeCheck (SeRestorePrivilege, ExGetPreviousMode ())) + return STATUS_PRIVILEGE_NOT_HELD; +#endif + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + Status = CmiLoadHive (KeyObjectAttributes, + FileObjectAttributes->ObjectName, + Flags); + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("CmiLoadHive() failed (Status %lx)\n", Status); + } + + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + + return Status; +} + +NTSTATUS STDCALL +NtInitializeRegistry (IN BOOLEAN SetUpBoot) +{ + NTSTATUS Status; + + PAGED_CODE(); + + if (CmiRegistryInitialized == TRUE) + return STATUS_ACCESS_DENIED; + + /* Save boot log file */ + IopSaveBootLogToFile(); + + Status = CmiInitHives (SetUpBoot); + + CmiRegistryInitialized = TRUE; return Status; } @@ -636,215 +923,6 @@ return Status; } -NTSTATUS STDCALL -NtFlushKey(IN HANDLE KeyHandle) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - PEREGISTRY_HIVE RegistryHive; - KPROCESSOR_MODE PreviousMode; - - PAGED_CODE(); - - DPRINT("NtFlushKey (KeyHandle %lx) called\n", KeyHandle); - - PreviousMode = ExGetPreviousMode(); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - 0, - CmpKeyObjectType, - PreviousMode, - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - VERIFY_KEY_OBJECT(KeyObject); - - RegistryHive = KeyObject->RegistryHive; - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - if (IsNoFileHive(RegistryHive)) - { - Status = STATUS_SUCCESS; - } - else - { - /* Flush non-volatile hive */ - Status = CmiFlushRegistryHive(RegistryHive); - } - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - ObDereferenceObject(KeyObject); - - return STATUS_SUCCESS; -} - - -NTSTATUS STDCALL -NtOpenKey(OUT PHANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) -{ - UNICODE_STRING RemainingPath; - KPROCESSOR_MODE PreviousMode; - PVOID Object = NULL; - HANDLE hKey = NULL; - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - REG_PRE_OPEN_KEY_INFORMATION PreOpenKeyInfo; - REG_POST_OPEN_KEY_INFORMATION PostOpenKeyInfo; - - PAGED_CODE(); - - DPRINT("NtOpenKey(KH 0x%p DA %x OA 0x%p OA->ON '%wZ'\n", - KeyHandle, - DesiredAccess, - ObjectAttributes, - ObjectAttributes ? ObjectAttributes->ObjectName : NULL); - - /* Check place for result handle, if it's null - return immediately */ - if (KeyHandle == NULL) - return(STATUS_INVALID_PARAMETER); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeAndZeroHandle(KeyHandle); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - /* WINE checks for the length also */ - /*if (ObjectAttributes->ObjectName->Length > MAX_NAME_LENGTH) - return(STATUS_BUFFER_OVERFLOW);*/ - - /* Capture all the info */ - DPRINT("Capturing Create Info\n"); - Status = ObpCaptureObjectAttributes(ObjectAttributes, - PreviousMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); - return Status; - } - - if (ObjectName.Buffer && - ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == '\\') - { - ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; - ObjectName.Length -= sizeof(WCHAR); - ObjectName.MaximumLength -= sizeof(WCHAR); - } - - PostOpenKeyInfo.CompleteName = &ObjectName; - PreOpenKeyInfo.CompleteName = &ObjectName; - Status = CmiCallRegisteredCallbacks(RegNtPreOpenKey, &PreOpenKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOpenKeyInfo.Object = NULL; - PostOpenKeyInfo.Status = Status; - CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - return Status; - } - - - RemainingPath.Buffer = NULL; - - Status = CmFindObject(&ObjectCreateInfo, - &ObjectName, - (PVOID*)&Object, - &RemainingPath, - CmpKeyObjectType, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("CmpFindObject() returned 0x%08lx\n", Status); - Status = STATUS_INVALID_HANDLE; /* Because ObFindObject returns STATUS_UNSUCCESSFUL */ - goto openkey_cleanup; - } - - VERIFY_KEY_OBJECT((PKEY_OBJECT) Object); - - DPRINT("RemainingPath '%wZ'\n", &RemainingPath); - - if ((RemainingPath.Buffer != NULL) && (RemainingPath.Buffer[0] != 0)) - { - RtlFreeUnicodeString(&RemainingPath); - Status = STATUS_OBJECT_NAME_NOT_FOUND; - goto openkey_cleanup; - } - - RtlFreeUnicodeString(&RemainingPath); - - /* Fail if the key has been deleted */ - if (((PKEY_OBJECT)Object)->Flags & KO_MARKED_FOR_DELETE) - { - Status = STATUS_UNSUCCESSFUL; - goto openkey_cleanup; - } - - Status = CmpCreateHandle(Object, - DesiredAccess, - ObjectCreateInfo.Attributes, - &hKey); - -openkey_cleanup: - - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - PostOpenKeyInfo.Object = NT_SUCCESS(Status) ? (PVOID)Object : NULL; - PostOpenKeyInfo.Status = Status; - CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - - if (Object) - { - ObDereferenceObject(Object); - } - - if (NT_SUCCESS(Status)) - { - _SEH_TRY - { - *KeyHandle = hKey; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - return Status; -} - NTSTATUS NTAPI NtQueryKey(IN HANDLE KeyHandle, @@ -1050,65 +1128,6 @@ ObDereferenceObject(KeyObject); CmiSyncHives(); return Status; -} - -/* - * NOTE: - * KeyObjectAttributes->RootDirectory specifies the handle to the parent key and - * KeyObjectAttributes->Name specifies the name of the key to load. - * Flags can be 0 or REG_NO_LAZY_FLUSH. - */ -NTSTATUS STDCALL -NtLoadKey2 (IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes, - IN ULONG Flags) -{ - NTSTATUS Status; - PAGED_CODE(); - DPRINT ("NtLoadKey2() called\n"); - -#if 0 - if (!SeSinglePrivilegeCheck (SeRestorePrivilege, ExGetPreviousMode ())) - return STATUS_PRIVILEGE_NOT_HELD; -#endif - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - Status = CmiLoadHive (KeyObjectAttributes, - FileObjectAttributes->ObjectName, - Flags); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("CmiLoadHive() failed (Status %lx)\n", Status); - } - - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - return Status; -} - -NTSTATUS STDCALL -NtInitializeRegistry (IN BOOLEAN SetUpBoot) -{ - NTSTATUS Status; - - PAGED_CODE(); - - if (CmiRegistryInitialized == TRUE) - return STATUS_ACCESS_DENIED; - - /* Save boot log file */ - IopSaveBootLogToFile(); - - Status = CmiInitHives (SetUpBoot); - - CmiRegistryInitialized = TRUE; - - return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Tue May 15 00:24:12 2007 @@ -630,32 +630,16 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) - { - DPRINT1("Key not found in parent list ???\n"); - } - RemoveEntryList(&KeyObject->ListEntry); RtlFreeUnicodeString(&KeyObject->Name); - if (KeyObject->Flags & KO_MARKED_FOR_DELETE) - { - DPRINT("delete really key\n"); - - CmiRemoveSubKey(KeyObject->RegistryHive, - ParentKeyObject, - KeyObject); - - KeQuerySystemTime (&ParentKeyObject->KeyCell->LastWriteTime); - HvMarkCellDirty (&ParentKeyObject->RegistryHive->Hive, - ParentKeyObject->KeyCellOffset); - - if (!IsNoFileHive (KeyObject->RegistryHive) || - !IsNoFileHive (ParentKeyObject->RegistryHive)) - { - CmiSyncHives (); - } - } + if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) + { + DPRINT1("Key not found in parent list ???\n"); + } + + + ASSERT((KeyObject->Flags & KO_MARKED_FOR_DELETE) == FALSE); ObDereferenceObject (ParentKeyObject);

1 0

[hpoussin] 26783: Also define the DPRINT_ constants in release mode
by hpoussin＠svn.reactos.org 14 May '07

14 May '07

Author: hpoussin Date: Tue May 15 00:07:16 2007 New Revision: 26783 URL: http://svn.reactos.org/svn/reactos?rev=26783&view=rev Log: Also define the DPRINT_ constants in release mode Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Tue May 15 00:07:16 2007 @@ -21,21 +21,21 @@ #ifndef __DEBUG_H #define __DEBUG_H +#define DPRINT_NONE 0x00000000 // No debug print +#define DPRINT_WARNING 0x00000001 // OR this with DebugPrintMask to enable debugger messages and other misc stuff +#define DPRINT_MEMORY 0x00000002 // OR this with DebugPrintMask to enable memory management messages +#define DPRINT_FILESYSTEM 0x00000004 // OR this with DebugPrintMask to enable file system messages +#define DPRINT_INIFILE 0x00000008 // OR this with DebugPrintMask to enable .ini file messages +#define DPRINT_UI 0x00000010 // OR this with DebugPrintMask to enable user interface messages +#define DPRINT_DISK 0x00000020 // OR this with DebugPrintMask to enable disk messages +#define DPRINT_CACHE 0x00000040 // OR this with DebugPrintMask to enable cache messages +#define DPRINT_REGISTRY 0x00000080 // OR this with DebugPrintMask to enable registry messages +#define DPRINT_REACTOS 0x00000100 // OR this with DebugPrintMask to enable ReactOS messages +#define DPRINT_LINUX 0x00000200 // OR this with DebugPrintMask to enable Linux messages +#define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages +#define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader + #ifdef DBG - - #define DPRINT_NONE 0x00000000 // No debug print - #define DPRINT_WARNING 0x00000001 // OR this with DebugPrintMask to enable debugger messages and other misc stuff - #define DPRINT_MEMORY 0x00000002 // OR this with DebugPrintMask to enable memory management messages - #define DPRINT_FILESYSTEM 0x00000004 // OR this with DebugPrintMask to enable file system messages - #define DPRINT_INIFILE 0x00000008 // OR this with DebugPrintMask to enable .ini file messages - #define DPRINT_UI 0x00000010 // OR this with DebugPrintMask to enable user interface messages - #define DPRINT_DISK 0x00000020 // OR this with DebugPrintMask to enable disk messages - #define DPRINT_CACHE 0x00000040 // OR this with DebugPrintMask to enable cache messages - #define DPRINT_REGISTRY 0x00000080 // OR this with DebugPrintMask to enable registry messages - #define DPRINT_REACTOS 0x00000100 // OR this with DebugPrintMask to enable ReactOS messages - #define DPRINT_LINUX 0x00000200 // OR this with DebugPrintMask to enable Linux messages - #define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages - #define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader VOID DebugInit(VOID); VOID DebugPrint(ULONG Mask, char *format, ...);

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