Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[greatlrd] 26888: switch to dxsdk 1 of 2 step This commit break the build
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 15:18:13 2007 New Revision: 26888 URL: http://svn.reactos.org/svn/reactos?rev=26888&view=rev Log: switch to dxsdk 1 of 2 step This commit break the build Removed: trunk/reactos/include/psdk/DShow.h trunk/reactos/include/psdk/activecf.h trunk/reactos/include/psdk/amaudio.h trunk/reactos/include/psdk/amparse.h trunk/reactos/include/psdk/amvideo.h trunk/reactos/include/psdk/audevcod.h trunk/reactos/include/psdk/d3d8caps.h trunk/reactos/include/psdk/d3d9caps.h trunk/reactos/include/psdk/d3dcaps.h trunk/reactos/include/psdk/d3dvec.inl trunk/reactos/include/psdk/ddraw.h trunk/reactos/include/psdk/dv.h trunk/reactos/include/psdk/dxdiag.h trunk/reactos/include/psdk/dxerr8.h trunk/reactos/include/psdk/dxerr9.h trunk/reactos/include/psdk/dxsdkver.h trunk/reactos/include/psdk/errors.h trunk/reactos/include/psdk/evcode.h trunk/reactos/include/psdk/ksguid.h trunk/reactos/include/psdk/ksuuids.h trunk/reactos/include/psdk/mediaerr.h trunk/reactos/include/psdk/uuids.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/include/psdk/DShow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/DShow.h?rev=2… Removed: trunk/reactos/include/psdk/activecf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activecf.h?re… Removed: trunk/reactos/include/psdk/amaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amaudio.h?rev… Removed: trunk/reactos/include/psdk/amparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amparse.h?rev… Removed: trunk/reactos/include/psdk/amvideo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amvideo.h?rev… Removed: trunk/reactos/include/psdk/audevcod.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/audevcod.h?re… Removed: trunk/reactos/include/psdk/d3d8caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8caps.h?re… Removed: trunk/reactos/include/psdk/d3d9caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9caps.h?re… Removed: trunk/reactos/include/psdk/d3dcaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dcaps.h?rev… Removed: trunk/reactos/include/psdk/d3dvec.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dvec.inl?re… Removed: trunk/reactos/include/psdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddraw.h?rev=2… Removed: trunk/reactos/include/psdk/dv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dv.h?rev=2688… Removed: trunk/reactos/include/psdk/dxdiag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxdiag.h?rev=… Removed: trunk/reactos/include/psdk/dxerr8.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxerr8.h?rev=… Removed: trunk/reactos/include/psdk/dxerr9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxerr9.h?rev=… Removed: trunk/reactos/include/psdk/dxsdkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxsdkver.h?re… Removed: trunk/reactos/include/psdk/errors.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/errors.h?rev=… Removed: trunk/reactos/include/psdk/evcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evcode.h?rev=… Removed: trunk/reactos/include/psdk/ksguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksguid.h?rev=… Removed: trunk/reactos/include/psdk/ksuuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksuuids.h?rev… Removed: trunk/reactos/include/psdk/mediaerr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mediaerr.h?re… Removed: trunk/reactos/include/psdk/uuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/uuids.h?rev=2…

1 0

[greatlrd] 26887: fixing two typo
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 14:51:26 2007 New Revision: 26887 URL: http://svn.reactos.org/svn/reactos?rev=26887&view=rev Log: fixing two typo Modified: trunk/reactos/include/dxsdk/d3dcaps.h trunk/reactos/include/dxsdk/dxdiag.h Modified: trunk/reactos/include/dxsdk/d3dcaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dcaps.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/d3dcaps.h (original) +++ trunk/reactos/include/dxsdk/d3dcaps.h Fri May 25 14:51:26 2007 @@ -278,7 +278,7 @@ typedef struct _D3DDeviceDesc { DWORD dwSize; - DWORD dwFlags + DWORD dwFlags; D3DCOLORMODEL dcmColorModel; DWORD dwDevCaps; D3DTRANSFORMCAPS dtcTransformCaps; Modified: trunk/reactos/include/dxsdk/dxdiag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxdiag.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dxdiag.h (original) +++ trunk/reactos/include/dxsdk/dxdiag.h Fri May 25 14:51:26 2007 @@ -14,17 +14,15 @@ DEFINE_GUID(IID_IDxDiagProvider, 0x9C6B4CB0, 0x23F8, 0x49CC, 0xA3, 0xED, 0x45, 0xA5, 0x50, 0x00, 0xA6, 0xD2); DEFINE_GUID(IID_IDxDiagContainer, 0x7D0F462F, 0x4064, 0x4862, 0xBC, 0x7F, 0x93, 0x3E, 0x50, 0x58, 0xC1, 0x0F); -typedef struct IDxDiagProvider *LPDXDIAGPROVIDER, *PDXDIAGPROVIDER; -#undef INTERFACE -#define INTERFACE IDxDiagProvider -DECLARE_INTERFACE_(IDxDiagProvider,IUnknown) +typedef struct _DXDIAG_INIT_PARAMS { - STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; - STDMETHOD(GetRootContainer) (THIS_ IDxDiagContainer **ppInstance) PURE; -}; + DWORD dwSize; + DWORD dwDxDiagHeaderVersion; + BOOL bAllowWHQLChecks; + VOID* pReserved; +} DXDIAG_INIT_PARAMS; + + typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER; #undef INTERFACE @@ -43,13 +41,17 @@ STDMETHOD(GetProp) (THIS_ LPCWSTR pwszPropName, VARIANT *pvarProp) PURE; }; -typedef struct _DXDIAG_INIT_PARAMS + typedef struct IDxDiagProvider *LPDXDIAGPROVIDER, *PDXDIAGPROVIDER; +#undef INTERFACE +#define INTERFACE IDxDiagProvider +DECLARE_INTERFACE_(IDxDiagProvider,IUnknown) { - DWORD dwSize; - DWORD dwDxDiagHeaderVersion; - BOOL bAllowWHQLChecks; - VOID* pReserved; -} DXDIAG_INIT_PARAMS; + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; + STDMETHOD(GetRootContainer) (THIS_ IDxDiagContainer **ppInstance) PURE; +}; #define DXDIAG_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) #if !defined(__cplusplus) || defined(CINTERFACE)

1 0

[greatlrd] 26886: remove a dprint that is not lonnger need it
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 14:07:18 2007 New Revision: 26886 URL: http://svn.reactos.org/svn/reactos?rev=26886&view=rev Log: remove a dprint that is not lonnger need it Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Fri May 25 14:07:18 2007 @@ -80,7 +80,6 @@ */ if (pDirectDraw->DrvGetDirectDrawInfo) { - DPRINT1("if u are using vmware driver and see this msg, please repot this\n"); success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, &HalInfo, &pDirectDraw->dwNumHeaps,

1 0

[greatlrd] 26885: Wrote one new header this morning compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 14:02:08 2007 New Revision: 26885 URL: http://svn.reactos.org/svn/reactos?rev=26885&view=rev Log: Wrote one new header this morning compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/evcode.h (with props) Added: trunk/reactos/include/dxsdk/evcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/evcode.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/evcode.h (added) +++ trunk/reactos/include/dxsdk/evcode.h Fri May 25 14:02:08 2007 @@ -1,0 +1,62 @@ + + +#ifndef AM_WMT_EVENT_DATA_DEFINED + #define AM_WMT_EVENT_DATA_DEFINED + typedef struct + { + HRESULT hrStatus; + void * pData; + } AM_WMT_EVENT_DATA; +#endif + +#define EC_ACTIVATE 0x13 +#define EC_BUFFERING_DATA 0x11 +#define EC_BUILT 0x300 +#define EC_CLOCK_CHANGED 0x0D +#define EC_CLOCK_UNSET 0x51 +#define EC_COMPLETE 0x01 +#define EC_CODECAPI_EVENT 0x57 +#define EC_DISPLAY_CHANGED 0x16 +#define EC_DEVICE_LOST 0x1f +#define EC_ERROR_STILLPLAYING 0x08 +#define EC_ERRORABORT 0x03 +#define EC_END_OF_SEGMENT 0x1C +#define EC_EXTDEVICE_MODE_CHANGE 0x31 +#define EC_FULLSCREEN_LOST 0x12 +#define EC_GRAPH_CHANGED 0x50 +#define EC_LENGTH_CHANGED 0x1E +#define EC_NOTIFY_WINDOW 0x19 +#define EC_NEED_RESTART 0x14 +#define EC_OLE_EVENT 0x18 +#define EC_PAUSED 0x0E +#define EC_PALETTE_CHANGED 0x09 +#define EC_PREPROCESS_COMPLETE 0x56 +#define EC_OPENING_FILE 0x10 +#define EC_QUALITY_CHANGE 0x0B +#define EC_REPAINT 0x05 +#define EC_STREAM_ERROR_STOPPED 0x06 +#define EC_STREAM_ERROR_STILLPLAYING 0x07 +#define EC_SYSTEMBASE 0x00 +#define EC_SHUTTING_DOWN 0x0C +#define EC_STEP_COMPLETE 0x24 +#define EC_STREAM_CONTROL_STOPPED 0x1A +#define EC_STREAM_CONTROL_STARTED 0x1B +#define EC_SEGMENT_STARTED 0x1D +#define EC_STARVATION 0x17 +#define EC_STATE_CHANGE 0x32 +#define EC_TIME 0x04 +#define EC_TIMECODE_AVAILABLE 0x30 +#define EC_USER 0x8000 +#define EC_USERABORT 0x02 +#define EC_UNBUILT 0x301 +#define EC_VMR_SURFACE_FLIPPED 0x54 +#define EC_VMR_RENDERDEVICE_SET 0x53 +#define EC_VMR_RECONNECTION_FAILED 0x55 +#define EC_VIDEO_SIZE_CHANGED 0x0A +#define EC_WINDOW_DESTROYED 0x15 +#define EC_WMT_EVENT_BASE 0x0251 +#define EC_WMT_INDEX_EVENT EC_WMT_EVENT_BASE +#define EC_WMT_EVENT EC_WMT_EVENT_BASE+1 +#define VMR_RENDER_DEVICE_OVERLAY 0x01 +#define VMR_RENDER_DEVICE_VIDMEM 0x02 +#define VMR_RENDER_DEVICE_SYSMEM 0x04 Propchange: trunk/reactos/include/dxsdk/evcode.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26884: Wrote one new header this morning compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 13:32:37 2007 New Revision: 26884 URL: http://svn.reactos.org/svn/reactos?rev=26884&view=rev Log: Wrote one new header this morning compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/dsetup.h (with props) Added: trunk/reactos/include/dxsdk/dsetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dsetup.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dsetup.h (added) +++ trunk/reactos/include/dxsdk/dsetup.h Fri May 25 13:32:37 2007 @@ -1,0 +1,190 @@ +#ifndef __DSETUP_H__ +#define __DSETUP_H__ + +#include <windows.h> + +#ifdef _WIN32 +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +enum _DSETUP_CB_PROGRESS_PHASE +{ + DSETUP_INITIALIZING, + DSETUP_EXTRACTING, + DSETUP_COPYING, + DSETUP_FINALIZING +}; + +typedef struct _DSETUP_CB_PROGRESS +{ + DWORD dwPhase; + DWORD dwInPhaseMaximum; + DWORD dwInPhaseProgress; + DWORD dwOverallMaximum; + DWORD dwOverallProgress; +} DSETUP_CB_PROGRESS; + +#ifdef _WIN32 + +INT WINAPI DirectXUnRegisterApplication( HWND hWnd, LPGUID lpGUID); + +#ifndef ANSI_ONLY + typedef struct _DIRECTXREGISTERAPPW + { + DWORD dwSize; + DWORD dwFlags; + LPWSTR lpszApplicationName; + LPGUID lpGUID; + LPWSTR lpszFilename; + LPWSTR lpszCommandLine; + LPWSTR lpszPath; + LPWSTR lpszCurrentDirectory; + } DIRECTXREGISTERAPPW, *PDIRECTXREGISTERAPPW, *LPDIRECTXREGISTERAPPW; + + typedef struct _DIRECTXREGISTERAPP2W + { + DWORD dwSize; + DWORD dwFlags; + LPWSTR lpszApplicationName; + LPGUID lpGUID; + LPWSTR lpszFilename; + LPWSTR lpszCommandLine; + LPWSTR lpszPath; + LPWSTR lpszCurrentDirectory; + LPWSTR lpszLauncherName; + } DIRECTXREGISTERAPP2W, *PDIRECTXREGISTERAPP2W, *LPDIRECTXREGISTERAPP2W; + + INT WINAPI DirectXSetupW( HWND hWnd, LPWSTR lpszRootPath, DWORD dwFlags); + INT WINAPI DirectXRegisterApplicationW( HWND hWnd, LPVOID lpDXRegApp); + UINT WINAPI DirectXSetupGetEULAW( LPWSTR lpszEULA, UINT cchEULA, WORD LangID); +#endif + +#ifndef UNICODE_ONLY + typedef struct _DIRECTXREGISTERAPPA + { + DWORD dwSize; + DWORD dwFlags; + LPSTR lpszApplicationName; + LPGUID lpGUID; + LPSTR lpszFilename; + LPSTR lpszCommandLine; + LPSTR lpszPath; + LPSTR lpszCurrentDirectory; + } DIRECTXREGISTERAPPA, *PDIRECTXREGISTERAPPA, *LPDIRECTXREGISTERAPPA; + + typedef struct _DIRECTXREGISTERAPP2A + { + DWORD dwSize; + DWORD dwFlags; + LPSTR lpszApplicationName; + LPGUID lpGUID; + LPSTR lpszFilename; + LPSTR lpszCommandLine; + LPSTR lpszPath; + LPSTR lpszCurrentDirectory; + LPSTR lpszLauncherName; + } DIRECTXREGISTERAPP2A, *PDIRECTXREGISTERAPP2A, *LPDIRECTXREGISTERAPP2A; + + INT WINAPI DirectXSetupA( HWND hWnd, LPSTR lpszRootPath, DWORD dwFlags); + INT WINAPI DirectXRegisterApplicationA( HWND hWnd, LPVOID lpDXRegApp); + UINT WINAPI DirectXSetupGetEULAA( LPSTR lpszEULA, UINT cchEULA, WORD LangID); +#endif + +#ifdef UNICODE + typedef DIRECTXREGISTERAPPW DIRECTXREGISTERAPP; + typedef PDIRECTXREGISTERAPPW PDIRECTXREGISTERAPP; + typedef LPDIRECTXREGISTERAPPW LPDIRECTXREGISTERAPP; + typedef DIRECTXREGISTERAPP2W DIRECTXREGISTERAPP2; + typedef PDIRECTXREGISTERAPP2W PDIRECTXREGISTERAPP2; + typedef LPDIRECTXREGISTERAPP2W LPDIRECTXREGISTERAPP2; + + typedef INT (WINAPI * LPDIRECTXSETUP)(HWND, LPWSTR, DWORD); + typedef INT (WINAPI * LPDIRECTXREGISTERAPPLICATION)(HWND, LPVOID); + typedef UINT (WINAPI * LPDIRECTXSETUPGETEULA)(LPWSTR, UINT, WORD); + + #define DirectXSetup DirectXSetupW + #define DirectXRegisterApplication DirectXRegisterApplicationW + #define DirectXSetupGetEULA DirectXSetupGetEULAW + + + +#else + typedef DIRECTXREGISTERAPPA DIRECTXREGISTERAPP; + typedef PDIRECTXREGISTERAPPA PDIRECTXREGISTERAPP; + typedef LPDIRECTXREGISTERAPPA LPDIRECTXREGISTERAPP; + typedef DIRECTXREGISTERAPP2A DIRECTXREGISTERAPP2; + typedef PDIRECTXREGISTERAPP2A PDIRECTXREGISTERAPP2; + typedef LPDIRECTXREGISTERAPP2A LPDIRECTXREGISTERAPP2; + + typedef INT (WINAPI * LPDIRECTXSETUP)(HWND, LPSTR, DWORD); + typedef INT (WINAPI * LPDIRECTXREGISTERAPPLICATION)(HWND, LPVOID); + typedef UINT (WINAPI * LPDIRECTXSETUPGETEULA)(LPSTR, UINT, WORD); + + #define DirectXSetup DirectXSetupA + #define DirectXRegisterApplication DirectXRegisterApplicationA + #define DirectXSetupGetEULA DirectXSetupGetEULAA + +#endif + + typedef DWORD (*DSETUP_CALLBACK)( DWORD Reason, DWORD MsgType, LPSTR szMessage, + LPSTR szName, void *pInfo); + + INT WINAPI DirectXSetupSetCallback(DSETUP_CALLBACK Callback); + INT WINAPI DirectXSetupGetVersion(DWORD *lpdwVersion, DWORD *lpdwMinorVersion); + INT WINAPI DirectXSetupShowEULA(HWND hWndParent); + +#endif + +#define FOURCC_VERS mmioFOURCC('v','e','r','s') +#define DSETUPERR_SUCCESS_RESTART 1 +#define DSETUPERR_SUCCESS 0 +#define DSETUPERR_BADWINDOWSVERSION -1 +#define DSETUPERR_SOURCEFILENOTFOUND -2 +#define DSETUPERR_NOCOPY -5 +#define DSETUPERR_OUTOFDISKSPACE -6 +#define DSETUPERR_CANTFINDINF -7 +#define DSETUPERR_CANTFINDDIR -8 +#define DSETUPERR_INTERNAL -9 +#define DSETUPERR_UNKNOWNOS -11 +#define DSETUPERR_NEWERVERSION -14 +#define DSETUPERR_NOTADMIN -15 +#define DSETUPERR_UNSUPPORTEDPROCESSOR -16 +#define DSETUPERR_MISSINGCAB_MANAGEDDX -17 +#define DSETUPERR_NODOTNETFRAMEWORKINSTALLED -18 +#define DSETUPERR_CABDOWNLOADFAIL -19 +#define DSETUP_DDRAWDRV 0x00000008 +#define DSETUP_DSOUNDDRV 0x00000010 +#define DSETUP_DXCORE 0x00010000 +#define DSETUP_DIRECTX (DSETUP_DXCORE|DSETUP_DDRAWDRV|DSETUP_DSOUNDDRV) +#define DSETUP_MANAGEDDX 0x00004000 +#define DSETUP_TESTINSTALL 0x00020000 +#define DSETUP_DDRAW 0x00000001 +#define DSETUP_DSOUND 0x00000002 +#define DSETUP_DPLAY 0x00000004 +#define DSETUP_DPLAYSP 0x00000020 +#define DSETUP_DVIDEO 0x00000040 +#define DSETUP_D3D 0x00000200 +#define DSETUP_DINPUT 0x00000800 +#define DSETUP_DIRECTXSETUP 0x00001000 +#define DSETUP_NOUI 0x00002000 +#define DSETUP_PROMPTFORDRIVERS 0x10000000 +#define DSETUP_RESTOREDRIVERS 0x20000000 +#define DSETUP_CB_MSG_NOMESSAGE 0 +#define DSETUP_CB_MSG_INTERNAL_ERROR 10 +#define DSETUP_CB_MSG_BEGIN_INSTALL 13 +#define DSETUP_CB_MSG_BEGIN_INSTALL_RUNTIME 14 +#define DSETUP_CB_MSG_PROGRESS 18 +#define DSETUP_CB_MSG_WARNING_DISABLED_COMPONENT 19 + + +#ifdef __cplusplus +}; +#endif + +#endif Propchange: trunk/reactos/include/dxsdk/dsetup.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 26883: - initialize display class with "Ms Shell Dlg" - don't show display window until font is set - use negative value for font size (patch by roytam1) See issue #2260 for more details.
by tkreuzer＠svn.reactos.org 25 May '07

25 May '07

Author: tkreuzer Date: Fri May 25 11:48:17 2007 New Revision: 26883 URL: http://svn.reactos.org/svn/reactos?rev=26883&view=rev Log: - initialize display class with "Ms Shell Dlg" - don't show display window until font is set - use negative value for font size (patch by roytam1) See issue #2260 for more details. Modified: trunk/rosapps/fontview/display.c trunk/rosapps/fontview/fontview.c Modified: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.c (original) +++ trunk/rosapps/fontview/display.c Fri May 25 11:48:17 2007 @@ -91,14 +91,7 @@ hOldFont = SelectObject(hDC, pData->hCaptionFont); GetTextMetrics(hDC, &tm); - if (*pData->szFormat == 0) - { - swprintf(szCaption, pData->szTypeFaceName); - } - else - { - swprintf(szCaption, L"%s (%s)", pData->szTypeFaceName, pData->szFormat); - } + swprintf(szCaption, L"%s%s", pData->szTypeFaceName, pData->szFormat); TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); y += tm.tmHeight + SPACING1; @@ -148,34 +141,109 @@ } static LRESULT +Display_SetTypeFace(HWND hwnd, LPARAM lParam) +{ + DISPLAYDATA* pData; + TEXTMETRIC tm; + HDC hDC; + RECT rect; + SCROLLINFO si; + int i; + + /* Set the new type face name */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + snwprintf(pData->szTypeFaceName, MAX_TYPEFACENAME, (WCHAR*)lParam); + + /* Create the new fonts */ + hDC = GetDC(hwnd); + DeleteObject(pData->hCharSetFont); + pData->hCharSetFont = CreateFontW(-MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72), + 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + + /* Get font format */ + // FIXME: Get the real font format (OpenType?) + SelectObject(hDC, pData->hCharSetFont); + GetTextMetrics(hDC, &tm); + if ((tm.tmPitchAndFamily & TMPF_TRUETYPE) == TMPF_TRUETYPE) + { + swprintf(pData->szFormat, L" (TrueType)"); + } + + for (i = 0; i < MAX_SIZES; i++) + { + DeleteObject(pData->hFonts[i]); + pData->hFonts[i] = CreateFontW(-MulDiv(pData->nSizes[i], GetDeviceCaps(hDC, LOGPIXELSY), 72), + 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + } + + /* Calculate new page dimensions */ + pData->nPageHeight = Display_DrawText(hDC, pData, 0); + ReleaseDC(hwnd, hDC); + + /* Set the vertical scrolling range and page size */ + GetClientRect(hwnd, &rect); + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; + si.nMin = 0; + si.nMax = pData->nPageHeight; + si.nPage = rect.bottom; + si.nPos = 0; + si.nTrackPos = 0; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + + return 0; +} + +static LRESULT +Display_SetString(HWND hwnd, LPARAM lParam) +{ + DISPLAYDATA* pData; + + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + snwprintf(pData->szString, MAX_STRING, (WCHAR*)lParam); + + // FIXME: redraw the window + + return 0; +} + +static LRESULT Display_OnCreate(HWND hwnd) { DISPLAYDATA* pData; const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; int i; - /* Initialize data structure */ + /* Create data structure */ pData = malloc(sizeof(DISPLAYDATA)); - pData->nPageHeight = 0; - swprintf(pData->szTypeFaceName, L""); - swprintf(pData->szFormat, L""); - swprintf(pData->szString, L""); - - for (i = 0; i < MAX_SIZES; i++) - { - pData->nSizes[i] = nSizes[i]; - } - - pData->hCaptionFont = CreateFontW(50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , L"Ms Shell Dlg"); - - pData->hSizeFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , L"Ms Shell Dlg"); + ZeroMemory(pData, sizeof(DISPLAYDATA)); /* Set the window's GWLP_USERDATA to our data structure */ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + + for (i = 0; i < MAX_SIZES; i++) + { + pData->nSizes[i] = nSizes[i]; + } + + pData->hCaptionFont = CreateFontW(50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); + + pData->hSizeFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); + + Display_SetString(hwnd, (LPARAM)L"Jackdaws love my big sphinx of quartz. 1234567890"); + Display_SetTypeFace(hwnd, (LPARAM)L"Ms Shell Dlg"); return 0; } @@ -196,7 +264,7 @@ BeginPaint(hwnd, &ps); - /* Fill with white */ + /* Erase background */ FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); /* Draw the text */ @@ -216,7 +284,7 @@ GetClientRect(hwnd, &rect); - /* Get the old pos */ + /* Get the old scroll pos */ si.cbSize = sizeof(si); si.fMask = SIF_POS; GetScrollInfo(hwnd, SB_VERT, &si); @@ -227,15 +295,15 @@ si.nPage = rect.bottom; SetScrollInfo(hwnd, SB_VERT, &si, TRUE); - /* Get the new pos */ + /* Get the new scroll pos */ si.fMask = SIF_POS; GetScrollInfo(hwnd, SB_VERT, &si); - /* If the don't match ... */ + /* If they don't match ... */ if (nOldPos != si.nPos) { /* ... scroll the window */ - ScrollWindowEx(hwnd, 0, -(si.nPos - nOldPos), NULL, NULL, NULL, NULL, SW_INVALIDATE); + ScrollWindowEx(hwnd, 0, nOldPos - si.nPos, NULL, NULL, NULL, NULL, SW_INVALIDATE); UpdateWindow(hwnd); } @@ -278,7 +346,7 @@ nPos = min(nPos, si.nMax); if (nPos != si.nPos) { - ScrollWindowEx(hwnd, 0, -(nPos - si.nPos), NULL, NULL, NULL, NULL, SW_INVALIDATE); + ScrollWindowEx(hwnd, 0, si.nPos - nPos, NULL, NULL, NULL, NULL, SW_INVALIDATE); si.cbSize = sizeof(si); si.nPos = nPos; si.fMask = SIF_POS; @@ -290,75 +358,6 @@ } static LRESULT -Display_SetTypeFace(HWND hwnd, LPARAM lParam) -{ - DISPLAYDATA* pData; - TEXTMETRIC tm; - HDC hDC; - RECT rect; - SCROLLINFO si; - int i; - - /* Set the new type face name */ - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - snwprintf(pData->szTypeFaceName, MAX_TYPEFACENAME, (WCHAR*)lParam); - - /* Create the new fonts */ - hDC = GetDC(hwnd); - pData->hCharSetFont = CreateFontW(-MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72), 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); - - /* Get font format */ - SelectObject(hDC, pData->hCharSetFont); - GetTextMetrics(hDC, &tm); - if ((tm.tmPitchAndFamily & TMPF_TRUETYPE) == TMPF_TRUETYPE) - { - swprintf(pData->szFormat, L"TrueType"); - } - - for (i = 0; i < MAX_SIZES; i++) - { - pData->hFonts[i] = CreateFontW(MulDiv(pData->nSizes[i], GetDeviceCaps(hDC, LOGPIXELSY), 72), - 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , pData->szTypeFaceName); - SelectObject(hDC, pData->hFonts[i]); - } - - /* Calculate new page dimensions */ - pData->nPageHeight = Display_DrawText(hDC, pData, 0); - ReleaseDC(hwnd, hDC); - - /* Set the vertical scrolling range and page size */ - GetClientRect(hwnd, &rect); - si.cbSize = sizeof(si); - si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; - si.nMin = 0; - si.nMax = pData->nPageHeight; - si.nPage = rect.bottom; - si.nPos = 0; - si.nTrackPos = 0; - SetScrollInfo(hwnd, SB_VERT, &si, TRUE); - - return 0; -} - -static LRESULT -Display_SetString(HWND hwnd, LPARAM lParam) -{ - DISPLAYDATA* pData; - - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - snwprintf(pData->szString, MAX_STRING, (WCHAR*)lParam); - - // FIXME: redraw the window - - return 0; -} - -static LRESULT Display_OnDestroy(HWND hwnd) { DISPLAYDATA* pData; @@ -385,8 +384,8 @@ LRESULT CALLBACK DisplayProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) - { + switch (message) + { case WM_CREATE: return Display_OnCreate(hwnd); @@ -405,13 +404,13 @@ case FVM_SETSTRING: return Display_SetString(hwnd, lParam); - case WM_DESTROY: + case WM_DESTROY: return Display_OnDestroy(hwnd); - default: - return DefWindowProcW(hwnd, message, wParam, lParam); - } - - return 0; -} - + default: + return DefWindowProcW(hwnd, message, wParam, lParam); + } + + return 0; +} + Modified: trunk/rosapps/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.c?rev=26… ============================================================================== --- trunk/rosapps/fontview/fontview.c (original) +++ trunk/rosapps/fontview/fontview.c Fri May 25 11:48:17 2007 @@ -191,7 +191,7 @@ 0, /* Extended style */ g_szFontDisplayClassName, /* Classname */ L"", /* Title text */ - WS_CHILD | WS_VSCROLL| WS_VISIBLE, /* Window style */ + WS_CHILD | WS_VSCROLL, /* Window style */ 0, /* X-pos */ HEADER_SIZE, /* Y-Pos */ 550, /* Width */ @@ -202,10 +202,12 @@ NULL /* Window Creation data */ ); - /* Init the display window with the font name */ LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING); SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); + + /* Init the display window with the font name */ SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)g_szTypeFaceName); + ShowWindow(hDisplay, SW_SHOWNORMAL); /* Create the quit button */ LoadStringW(g_hInstance, IDS_QUIT, szQuit, MAX_BUTTONNAME);

1 0

[fireball] 26882: - ACPI was intentionally disabled. Reverting 26870, thus unregressing VMWare video driver installation (since PCI bus is now again being enumerated).
by fireball＠svn.reactos.org 25 May '07

25 May '07

Author: fireball Date: Fri May 25 11:46:48 2007 New Revision: 26882 URL: http://svn.reactos.org/svn/reactos?rev=26882&view=rev Log: - ACPI was intentionally disabled. Reverting 26870, thus unregressing VMWare video driver installation (since PCI bus is now again being enumerated). Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Fri May 25 11:46:48 2007 @@ -2695,9 +2695,9 @@ const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI BIOS"); UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0"); static ULONG DeviceIndexPci = 0; - const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); + /*const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0"); - static ULONG DeviceIndexAcpi = 0; + static ULONG DeviceIndexAcpi = 0;*/ const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); static ULONG DeviceIndexSerial = 0; @@ -2957,11 +2957,11 @@ pHardwareId = &HardwareIdPci; DeviceIndex = DeviceIndexPci++; } - else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) + /*else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) { pHardwareId = &HardwareIdAcpi; DeviceIndex = DeviceIndexAcpi++; - } + }*/ else { /* Unknown device */ @@ -3083,6 +3083,8 @@ static BOOLEAN INIT_FUNCTION IopIsAcpiComputer(VOID) { + return FALSE; +#if 0 UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); UNICODE_STRING AcpiBiosIdentifier = RTL_CONSTANT_STRING(L"ACPI BIOS"); @@ -3214,6 +3216,7 @@ if (hDeviceKey) ZwClose(hDeviceKey); return ret; +#endif } static NTSTATUS INIT_FUNCTION

1 0

[gedmurphy] 26881: add a tool to allow the RosBE cmd window to flash when the build has stopped.
by gedmurphy＠svn.reactos.org 24 May '07

24 May '07

Author: gedmurphy Date: Fri May 25 00:48:20 2007 New Revision: 26881 URL: http://svn.reactos.org/svn/reactos?rev=26881&view=rev Log: add a tool to allow the RosBE cmd window to flash when the build has stopped. Added: trunk/tools/RosBE-Windows/Tools/flash.c Added: trunk/tools/RosBE-Windows/Tools/flash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/flash.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/flash.c (added) +++ trunk/tools/RosBE-Windows/Tools/flash.c Fri May 25 00:48:20 2007 @@ -1,0 +1,47 @@ +#include <windows.h> + +HWND GetConsoleHwnd(void) +{ + WCHAR szNewTitle[MAX_PATH]; + WCHAR szOldTitle[MAX_PATH]; + HWND hwnd = NULL; + + if (GetConsoleTitleW(szOldTitle, MAX_PATH)) + { + wsprintfW(szNewTitle, + L"%d/%d", + GetTickCount(), + GetCurrentProcessId()); + + if (SetConsoleTitleW(szNewTitle)) + { + Sleep(40); + + hwnd = FindWindowW(NULL, szNewTitle); + + SetConsoleTitleW(szOldTitle); + } + } + + return hwnd; +} + + +int main() +{ + HWND hwnd; + FLASHWINFO fwi = {0,}; + + hwnd = GetConsoleHwnd(); + if (hwnd) + { + fwi.cbSize = sizeof(FLASHWINFO); + fwi.hwnd = hwnd; + fwi.dwFlags = FLASHW_ALL | FLASHW_TIMERNOFG; + fwi.uCount = 20; + + FlashWindowEx(&fwi); + } + + return 0; +}

1 0

[fireball] 26880: - Fix wrong access-rights when referencing the object (fixes NtEnumerateKey() API). - Add DPRINTs for problems with objects referencing.
by fireball＠svn.reactos.org 24 May '07

24 May '07

Author: fireball Date: Thu May 24 17:23:33 2007 New Revision: 26880 URL: http://svn.reactos.org/svn/reactos?rev=26880&view=rev Log: - Fix wrong access-rights when referencing the object (fixes NtEnumerateKey() API). - Add DPRINTs for problems with objects referencing. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.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 Thu May 24 17:23:33 2007 @@ -726,7 +726,11 @@ ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -772,6 +776,128 @@ DPRINT("NtEnumerateKey() KH 0x%x, Index 0x%x, KIC %d, Length %d\n", KeyHandle, Index, KeyInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_ENUMERATE_SUB_KEYS, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Object = (PVOID)KeyObject; + EnumerateKeyInfo.Index = Index; + EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; + EnumerateKeyInfo.Length = Length; + EnumerateKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateKey(KeyObject, + Index, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); + } + + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtEnumerateValueKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", + KeyHandle, Index, KeyValueInformationClass, Length); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Index = Index; + EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; + EnumerateValueKeyInfo.Length = Length; + EnumerateValueKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, + &EnumerateValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmEnumerateValueKey(KeyObject, + Index, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); + } + + ObDereferenceObject(KeyObject); + return Status; +} + +NTSTATUS +NTAPI +NtQueryKey(IN HANDLE KeyHandle, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_QUERY_KEY_INFORMATION QueryKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", + KeyHandle, KeyInformationClass, Length); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, @@ -782,31 +908,34 @@ ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Object = (PVOID)KeyObject; - EnumerateKeyInfo.Index = Index; - EnumerateKeyInfo.KeyInformationClass = KeyInformationClass; - EnumerateKeyInfo.Length = Length; - EnumerateKeyInfo.ResultLength = ResultLength; + QueryKeyInfo.Object = (PVOID)KeyObject; + QueryKeyInfo.KeyInformationClass = KeyInformationClass; + QueryKeyInfo.KeyInformation = KeyInformation; + QueryKeyInfo.Length = Length; + QueryKeyInfo.ResultLength = ResultLength; /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); + Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); if (NT_SUCCESS(Status)) { /* Call the internal API */ - Status = CmEnumerateKey(KeyObject, - Index, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); + Status = CmQueryKey(KeyObject, + KeyInformationClass, + KeyInformation, + Length, + ResultLength); /* Do the post callback */ PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); + CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); } /* Dereference and return status */ @@ -816,21 +945,21 @@ NTSTATUS NTAPI -NtEnumerateValueKey(IN HANDLE KeyHandle, - IN ULONG Index, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) +NtQueryValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) { NTSTATUS Status; PKEY_OBJECT KeyObject; - REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; + REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); - DPRINT("NtEnumerateValueKey() KH 0x%x, Index 0x%x, KVIC %d, Length %d\n", - KeyHandle, Index, KeyValueInformationClass, Length); + DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", + KeyHandle, ValueName, KeyValueInformationClass, Length); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, @@ -839,122 +968,11 @@ ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Object = (PVOID)KeyObject; - EnumerateValueKeyInfo.Index = Index; - EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; - EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; - EnumerateValueKeyInfo.Length = Length; - EnumerateValueKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, - &EnumerateValueKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmEnumerateValueKey(KeyObject, - Index, - KeyValueInformationClass, - KeyValueInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); - } - - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtQueryKey(IN HANDLE KeyHandle, - IN KEY_INFORMATION_CLASS KeyInformationClass, - OUT PVOID KeyInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_QUERY_KEY_INFORMATION QueryKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtQueryKey() KH 0x%x, KIC %d, Length %d\n", - KeyHandle, KeyInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - (KeyInformationClass != - KeyNameInformation) ? - KEY_QUERY_VALUE : 0, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Setup the callback */ - PostOperationInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.Object = (PVOID)KeyObject; - QueryKeyInfo.KeyInformationClass = KeyInformationClass; - QueryKeyInfo.KeyInformation = KeyInformation; - QueryKeyInfo.Length = Length; - QueryKeyInfo.ResultLength = ResultLength; - - /* Do the callback */ - Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); - if (NT_SUCCESS(Status)) - { - /* Call the internal API */ - Status = CmQueryKey(KeyObject, - KeyInformationClass, - KeyInformation, - Length, - ResultLength); - - /* Do the post callback */ - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); - } - - /* Dereference and return status */ - ObDereferenceObject(KeyObject); - return Status; -} - -NTSTATUS -NTAPI -NtQueryValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PKEY_OBJECT KeyObject; - REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - PAGED_CODE(); - - DPRINT("NtQueryValueKey() KH 0x%x, VN '%wZ', KVIC %d, Length %d\n", - KeyHandle, ValueName, KeyValueInformationClass, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -981,6 +999,8 @@ CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); } + DPRINT("NtQueryValueKey() returning 0x%08X\n", Status); + /* Dereference and return status */ ObDereferenceObject(KeyObject); return Status; @@ -1011,7 +1031,11 @@ ExGetPreviousMode(), (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return(Status); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Setup callback */ PostOperationInfo.Object = (PVOID)KeyObject; @@ -1063,7 +1087,11 @@ PreviousMode, (PVOID *)&KeyObject, NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + return Status; + } /* Do the callback */ DeleteValueKeyInfo.Object = (PVOID)KeyObject;

1 0

[gedmurphy] 26879: add a check for .NET 2.0
by gedmurphy＠svn.reactos.org 24 May '07

24 May '07

Author: gedmurphy Date: Thu May 24 16:34:09 2007 New Revision: 26879 URL: http://svn.reactos.org/svn/reactos?rev=26879&view=rev Log: add a check for .NET 2.0 Modified: trunk/tools/RosTE/installer/RosTE.nsi Modified: trunk/tools/RosTE/installer/RosTE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/installer/RosTE.nsi?re… ============================================================================== --- trunk/tools/RosTE/installer/RosTE.nsi (original) +++ trunk/tools/RosTE/installer/RosTE.nsi Thu May 24 16:34:09 2007 @@ -61,7 +61,24 @@ ShowInstDetails show ShowUnInstDetails show +!macro Check_DotNet + ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\.NETFramework" "InstallRoot" + + StrCmp $R0 "" NotFound VerifyVersion + + VerifyVersion: + IfFileExists "$R0\v2.0.50727\*.*" Found NotFound + + NotFound: + MessageBox MB_OK|MB_ICONEXCLAMATION "This application requires the .NET 2.0 framework." + Quit + + Found: +macroend + + Section "InstallGui" SEC01 + !insertmacro Check_DotNet SetOutPath "$INSTDIR\GUI" SetOverwrite ifnewer File "${SOURCE_DIR}\GUI\QemuGUI.exe"

1 0

← Newer
1
2
3
4
5
6
7
8
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007