Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[tkreuzer] 53341: [MSVCRT] Fix usage of set_entrypoint
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 17:00:31 2011 New Revision: 53341 URL: http://svn.reactos.org/svn/reactos?rev=53341&view=rev Log: [MSVCRT] Fix usage of set_entrypoint Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sat Aug 20 17:00:31 2011 @@ -28,7 +28,7 @@ endif() add_dependencies(msvcrt psdk) -set_entrypoint(msvcrt DllMain@12) +set_entrypoint(msvcrt DllMain 12) set_image_base(msvcrt ${baseaddress_msvcrt}) target_link_libraries(msvcrt crt wine)

1 0

[tkreuzer] 53340: [PSDK] Simplify definition for YieldProcessor and add DbgRaiseAssertion for amd64 in winnt.h [ASM] Fix some stuff for amd64
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 15:53:56 2011 New Revision: 53340 URL: http://svn.reactos.org/svn/reactos?rev=53340&view=rev Log: [PSDK] Simplify definition for YieldProcessor and add DbgRaiseAssertion for amd64 in winnt.h [ASM] Fix some stuff for amd64 Modified: trunk/reactos/include/asm/asm.inc trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/asm.inc Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=53… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Sat Aug 20 15:53:56 2011 @@ -197,16 +197,22 @@ /* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ .macro .PROC name .func \name +#ifdef _X86_ _\name: +#else + \name: +#endif .cfi_startproc .equ cfa_current_offset, -8 .endm +#define FUNC .PROC /* ... and .ENDP, replacing ENDP */ .macro .ENDP name .cfi_endproc .endfunc .endm +#define ENDFUNC .ENDP /* MASM compatible PUBLIC */ .macro PUBLIC symbol Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 20 15:53:56 2011 @@ -3318,7 +3318,7 @@ SIZE_T PagefileLimit; LARGE_INTEGER TimeLimit; } QUOTA_LIMITS,*PQUOTA_LIMITS; - + typedef struct _QUOTA_LIMITS_EX { SIZE_T PagedPoolLimit; SIZE_T NonPagedPoolLimit; @@ -5265,17 +5265,9 @@ #error Unknown architecture #endif -#if defined(_M_IX86) - -#ifdef _MSC_VER -#pragma intrinsic(__int2c) -#pragma intrinsic(_mm_pause) +#if defined(_M_IX86) || defined(_M_AMD64) + #define YieldProcessor _mm_pause -#else -#define YieldProcessor() __asm__ __volatile__("pause"); -#define __int2c() __asm__ __volatile__("int $0x2c"); -#endif - FORCEINLINE VOID @@ -5284,13 +5276,6 @@ __int2c(); } -#elif defined (_M_AMD64) -#ifdef _MSC_VER -#pragma intrinsic(_mm_pause) -#define YieldProcessor _mm_pause -#else -#define YieldProcessor() __asm__ __volatile__("pause"); -#endif #elif defined(_M_PPC) #define YieldProcessor() __asm__ __volatile__("nop"); #elif defined(_M_MIPS) Modified: trunk/reactos/include/reactos/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.inc?re… ============================================================================== --- trunk/reactos/include/reactos/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/asm.inc [iso-8859-1] Sat Aug 20 15:53:56 2011 @@ -149,16 +149,22 @@ /* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ .macro .PROC name .func \name +#ifdef _X86_ _\name: +#else + \name: +#endif .cfi_startproc .equ cfa_current_offset, -8 .endm +#define FUNC .PROC /* ... and .ENDP, replacing ENDP */ .macro .ENDP name .cfi_endproc .endfunc .endm +#define ENDFUNC .ENDP /* MASM compatible PUBLIC */ .macro PUBLIC symbol @@ -269,6 +275,10 @@ #define else .else #define elseif .elseif +#define CR "\r" +#define LF "\n" +#define NUL "\0" + #endif /* Common definitions for FPO macro

1 0

[akhaldi] 53339: * Somehow these got missed in the sync, even though they were marked as committed...
by akhaldi＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: akhaldi Date: Sat Aug 20 13:55:31 2011 New Revision: 53339 URL: http://svn.reactos.org/svn/reactos?rev=53339&view=rev Log: * Somehow these got missed in the sync, even though they were marked as committed... Modified: branches/shell32_new-bringup/dll/directx/wine/d3d8/d3d8_private.h branches/shell32_new-bringup/dll/directx/wine/d3d9/d3d9_private.h Modified: branches/shell32_new-bringup/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/directx… ============================================================================== --- branches/shell32_new-bringup/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1] Sat Aug 20 13:55:31 2011 @@ -109,7 +109,6 @@ typedef struct IDirect3DIndexBuffer8Impl IDirect3DIndexBuffer8Impl; typedef struct IDirect3DSurface8Impl IDirect3DSurface8Impl; typedef struct IDirect3DSwapChain8Impl IDirect3DSwapChain8Impl; -typedef struct IDirect3DResource8Impl IDirect3DResource8Impl; typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl; typedef struct IDirect3DVertexBuffer8Impl IDirect3DVertexBuffer8Impl; typedef struct IDirect3DVertexShader8Impl IDirect3DVertexShader8Impl; @@ -132,12 +131,9 @@ */ struct IDirect3D8Impl { - /* IUnknown fields */ - const IDirect3D8Vtbl *lpVtbl; - LONG ref; - - /* The WineD3D device */ - IWineD3D *WineD3D; + IDirect3D8 IDirect3D8_iface; + LONG ref; + struct wined3d *WineD3D; }; /***************************************************************************** @@ -178,22 +174,22 @@ struct IDirect3DDevice8Impl { /* IUnknown fields */ - const IDirect3DDevice8Vtbl *lpVtbl; - const IWineD3DDeviceParentVtbl *device_parent_vtbl; - LONG ref; -/* But what about baseVertexIndex in state blocks? hmm... it may be a better idea to pass this to wined3d */ - IWineD3DDevice *WineD3DDevice; - struct d3d8_handle_table handle_table; + IDirect3DDevice8 IDirect3DDevice8_iface; + struct wined3d_device_parent device_parent; + LONG ref; + struct wined3d_device *wined3d_device; + struct d3d8_handle_table handle_table; /* FVF management */ struct FvfToDecl *decls; UINT numConvertedDecls, declArraySize; /* Avoids recursion with nested ReleaseRef to 0 */ - BOOL inDestruction; -}; - -HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapter, + BOOL inDestruction; + BOOL lost; +}; + +HRESULT device_init(IDirect3DDevice8Impl *device, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; /* ---------------- */ @@ -205,18 +201,11 @@ */ struct IDirect3DVolume8Impl { - /* IUnknown fields */ - const IDirect3DVolume8Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DVolume8 fields */ - IWineD3DVolume *wineD3DVolume; - - /* The volume container */ - IUnknown *container; - - /* If set forward refcounting to this object */ - IUnknown *forwardReference; + IDirect3DVolume8 IDirect3DVolume8_iface; + LONG ref; + struct wined3d_volume *wined3d_volume; + IUnknown *container; + IUnknown *forwardReference; }; HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, UINT width, UINT height, @@ -232,14 +221,10 @@ struct IDirect3DSwapChain8Impl { /* IUnknown fields */ - const IDirect3DSwapChain8Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DSwapChain8 fields */ - IWineD3DSwapChain *wineD3DSwapChain; - - /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; + IDirect3DSwapChain8 IDirect3DSwapChain8_iface; + LONG ref; + struct wined3d_swapchain *wined3d_swapchain; + IDirect3DDevice8 *parentDevice; }; HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl *device, @@ -257,12 +242,8 @@ /* IUnknown fields */ const IDirect3DSurface8Vtbl *lpVtbl; LONG ref; - - /* IDirect3DSurface8 fields */ - IWineD3DSurface *wineD3DSurface; - - /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; + struct wined3d_surface *wined3d_surface; + IDirect3DDevice8 *parentDevice; /* The surface container */ IUnknown *container; @@ -275,16 +256,6 @@ UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) DECLSPEC_HIDDEN; -struct IDirect3DResource8Impl -{ - /* IUnknown fields */ - const IDirect3DResource8Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResource8 fields */ - IWineD3DResource *wineD3DResource; -}; - /* ---------------------- */ /* IDirect3DVertexBuffer8 */ /* ---------------------- */ @@ -298,13 +269,9 @@ const IDirect3DVertexBuffer8Vtbl *lpVtbl; LONG ref; - /* IDirect3DResource8 fields */ - IWineD3DBuffer *wineD3DVertexBuffer; - - /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; - - DWORD fvf; + struct wined3d_buffer *wineD3DVertexBuffer; + IDirect3DDevice8 *parentDevice; + DWORD fvf; }; HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Impl *device, @@ -323,12 +290,8 @@ const IDirect3DIndexBuffer8Vtbl *lpVtbl; LONG ref; - /* IDirect3DResource8 fields */ - IWineD3DBuffer *wineD3DIndexBuffer; - - /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; - + struct wined3d_buffer *wineD3DIndexBuffer; + IDirect3DDevice8 *parentDevice; enum wined3d_format_id format; }; @@ -347,9 +310,7 @@ /* IUnknown fields */ const IDirect3DBaseTexture8Vtbl *lpVtbl; LONG ref; - - /* IDirect3DResource8 fields */ - IWineD3DBaseTexture *wineD3DBaseTexture; + struct wined3d_texture *wined3d_texture; }; /* --------------------- */ @@ -361,15 +322,10 @@ */ struct IDirect3DCubeTexture8Impl { - /* IUnknown fields */ - const IDirect3DCubeTexture8Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResource8 fields */ - IWineD3DCubeTexture *wineD3DCubeTexture; - - /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; + IDirect3DCubeTexture8 IDirect3DCubeTexture8_iface; + LONG ref; + struct wined3d_texture *wined3d_texture; + IDirect3DDevice8 *parentDevice; }; HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Impl *device, @@ -384,15 +340,10 @@ */ struct IDirect3DTexture8Impl { - /* IUnknown fields */ - const IDirect3DTexture8Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResourc8 fields */ - IWineD3DTexture *wineD3DTexture; - - /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; + IDirect3DTexture8 IDirect3DTexture8_iface; + LONG ref; + struct wined3d_texture *wined3d_texture; + IDirect3DDevice8 *parentDevice; }; HRESULT texture_init(IDirect3DTexture8Impl *texture, IDirect3DDevice8Impl *device, @@ -407,15 +358,10 @@ */ struct IDirect3DVolumeTexture8Impl { - /* IUnknown fields */ - const IDirect3DVolumeTexture8Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResource8 fields */ - IWineD3DVolumeTexture *wineD3DVolumeTexture; - - /* Parent reference */ - LPDIRECT3DDEVICE8 parentDevice; + IDirect3DVolumeTexture8 IDirect3DVolumeTexture8_iface; + LONG ref; + struct wined3d_texture *wined3d_texture; + IDirect3DDevice8 *parentDevice; }; HRESULT volumetexture_init(IDirect3DVolumeTexture8Impl *texture, IDirect3DDevice8Impl *device, @@ -455,7 +401,7 @@ DWORD *elements; DWORD elements_size; /* Size of elements, in bytes */ - IWineD3DVertexDeclaration *wined3d_vertex_declaration; + struct wined3d_vertex_declaration *wined3d_vertex_declaration; DWORD shader_handle; } IDirect3DVertexDeclaration8Impl; @@ -509,11 +455,10 @@ */ struct IDirect3DVertexShader8Impl { - const IDirect3DVertexShader8Vtbl *lpVtbl; - LONG ref; - - IDirect3DVertexDeclaration8 *vertex_declaration; - IWineD3DVertexShader *wineD3DVertexShader; + IDirect3DVertexShader8 IDirect3DVertexShader8_iface; + LONG ref; + IDirect3DVertexDeclaration8 *vertex_declaration; + struct wined3d_shader *wined3d_shader; }; HRESULT vertexshader_init(IDirect3DVertexShader8Impl *shader, IDirect3DDevice8Impl *device, @@ -525,11 +470,10 @@ * IDirect3DPixelShader implementation structure */ typedef struct IDirect3DPixelShader8Impl { - const IDirect3DPixelShader8Vtbl *lpVtbl; + IDirect3DPixelShader8 IDirect3DPixelShader8_iface; LONG ref; - - DWORD handle; - IWineD3DPixelShader *wineD3DPixelShader; + DWORD handle; + struct wined3d_shader *wined3d_shader; } IDirect3DPixelShader8Impl; HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl *device, @@ -537,7 +481,7 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; -void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader) DECLSPEC_HIDDEN; +void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; #endif /* __WINE_D3DX8_PRIVATE_H */ Modified: branches/shell32_new-bringup/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/directx… ============================================================================== --- branches/shell32_new-bringup/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1] Sat Aug 20 13:55:31 2011 @@ -146,11 +146,10 @@ typedef struct IDirect3D9Impl { /* IUnknown fields */ - const IDirect3D9ExVtbl *lpVtbl; - LONG ref; - - /* The WineD3D device */ - IWineD3D *WineD3D; + IDirect3D9Ex IDirect3D9Ex_iface; + LONG ref; + + struct wined3d *WineD3D; /* Created via Direct3DCreate9Ex? Can QI extended interfaces */ BOOL extended; @@ -163,14 +162,10 @@ */ typedef struct IDirect3DDevice9Impl { - /* IUnknown fields */ - const IDirect3DDevice9ExVtbl *lpVtbl; - const IWineD3DDeviceParentVtbl *device_parent_vtbl; - LONG ref; - - /* IDirect3DDevice9 fields */ - IWineD3DDevice *WineD3DDevice; - + IDirect3DDevice9Ex IDirect3DDevice9Ex_iface; + struct wined3d_device_parent device_parent; + LONG ref; + struct wined3d_device *wined3d_device; /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; @@ -180,8 +175,8 @@ BOOL notreset; } IDirect3DDevice9Impl; -HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapter, D3DDEVTYPE device_type, - HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; +HRESULT device_init(IDirect3DDevice9Impl *device, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, + HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVolume9 implementation structure @@ -189,17 +184,11 @@ typedef struct IDirect3DVolume9Impl { /* IUnknown fields */ - const IDirect3DVolume9Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DVolume9 fields */ - IWineD3DVolume *wineD3DVolume; - - /* The volume container */ - IUnknown *container; - - /* If set forward refcounting to this object */ - IUnknown *forwardReference; + IDirect3DVolume9 IDirect3DVolume9_iface; + LONG ref; + struct wined3d_volume *wined3d_volume; + IUnknown *container; + IUnknown *forwardReference; } IDirect3DVolume9Impl; HRESULT volume_init(IDirect3DVolume9Impl *volume, IDirect3DDevice9Impl *device, UINT width, UINT height, @@ -217,15 +206,8 @@ /* IUnknown fields */ const IDirect3DSwapChain9Vtbl *lpVtbl; LONG ref; - - /* IDirect3DSwapChain9 fields */ - IWineD3DSwapChain *wineD3DSwapChain; - - /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; - - /* Flags an implicit swap chain */ - BOOL isImplicit; + struct wined3d_swapchain *wined3d_swapchain; + IDirect3DDevice9Ex *parentDevice; } IDirect3DSwapChain9Impl; HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device, @@ -243,12 +225,8 @@ /* IUnknown fields */ const IDirect3DSurface9Vtbl *lpVtbl; LONG ref; - - /* IDirect3DResource9 fields */ - IWineD3DSurface *wineD3DSurface; - - /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + struct wined3d_surface *wined3d_surface; + IDirect3DDevice9Ex *parentDevice; /* The surface container */ IUnknown *container; @@ -276,12 +254,8 @@ const IDirect3DVertexBuffer9Vtbl *lpVtbl; LONG ref; - /* IDirect3DResource9 fields */ - IWineD3DBuffer *wineD3DVertexBuffer; - - /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; - + struct wined3d_buffer *wineD3DVertexBuffer; + IDirect3DDevice9Ex *parentDevice; DWORD fvf; } IDirect3DVertexBuffer9Impl; @@ -301,11 +275,8 @@ const IDirect3DIndexBuffer9Vtbl *lpVtbl; LONG ref; - /* IDirect3DResource9 fields */ - IWineD3DBuffer *wineD3DIndexBuffer; - - /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + struct wined3d_buffer *wineD3DIndexBuffer; + IDirect3DDevice9Ex *parentDevice; enum wined3d_format_id format; } IDirect3DIndexBuffer9Impl; @@ -321,12 +292,9 @@ */ typedef struct IDirect3DBaseTexture9Impl { - /* IUnknown fields */ const IDirect3DBaseTexture9Vtbl *lpVtbl; LONG ref; - - /* IDirect3DResource9 fields */ - IWineD3DBaseTexture *wineD3DBaseTexture; + struct wined3d_texture *wined3d_texture; } IDirect3DBaseTexture9Impl; /* --------------------- */ @@ -338,15 +306,10 @@ */ typedef struct IDirect3DCubeTexture9Impl { - /* IUnknown fields */ - const IDirect3DCubeTexture9Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResource9 fields */ - IWineD3DCubeTexture *wineD3DCubeTexture; - - /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + IDirect3DCubeTexture9 IDirect3DCubeTexture9_iface; + LONG ref; + struct wined3d_texture *wined3d_texture; + IDirect3DDevice9Ex *parentDevice; } IDirect3DCubeTexture9Impl; HRESULT cubetexture_init(IDirect3DCubeTexture9Impl *texture, IDirect3DDevice9Impl *device, @@ -361,15 +324,10 @@ */ typedef struct IDirect3DTexture9Impl { - /* IUnknown fields */ - const IDirect3DTexture9Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResource9 fields */ - IWineD3DTexture *wineD3DTexture; - - /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + IDirect3DTexture9 IDirect3DTexture9_iface; + LONG ref; + struct wined3d_texture *wined3d_texture; + IDirect3DDevice9Ex *parentDevice; } IDirect3DTexture9Impl; HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *device, @@ -384,15 +342,10 @@ */ typedef struct IDirect3DVolumeTexture9Impl { - /* IUnknown fields */ - const IDirect3DVolumeTexture9Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DResource9 fields */ - IWineD3DVolumeTexture *wineD3DVolumeTexture; - - /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + IDirect3DVolumeTexture9 IDirect3DVolumeTexture9_iface; + LONG ref; + struct wined3d_texture *wined3d_texture; + IDirect3DDevice9Ex *parentDevice; } IDirect3DVolumeTexture9Impl; HRESULT volumetexture_init(IDirect3DVolumeTexture9Impl *texture, IDirect3DDevice9Impl *device, @@ -406,19 +359,18 @@ * IDirect3DStateBlock9 implementation structure */ typedef struct IDirect3DStateBlock9Impl { - /* IUnknown fields */ - const IDirect3DStateBlock9Vtbl *lpVtbl; + IDirect3DStateBlock9 IDirect3DStateBlock9_iface; LONG ref; /* IDirect3DStateBlock9 fields */ - IWineD3DStateBlock *wineD3DStateBlock; + struct wined3d_stateblock *wined3d_stateblock; /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + IDirect3DDevice9Ex *parentDevice; } IDirect3DStateBlock9Impl; HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Impl *device, - D3DSTATEBLOCKTYPE type, IWineD3DStateBlock *wined3d_stateblock) DECLSPEC_HIDDEN; + D3DSTATEBLOCKTYPE type, struct wined3d_stateblock *wined3d_stateblock) DECLSPEC_HIDDEN; /* --------------------------- */ /* IDirect3DVertexDeclaration9 */ @@ -436,7 +388,7 @@ UINT element_count; /* IDirect3DVertexDeclaration9 fields */ - IWineD3DVertexDeclaration *wineD3DVertexDeclaration; + struct wined3d_vertex_declaration *wineD3DVertexDeclaration; DWORD convFVF; /* Parent reference */ @@ -457,13 +409,9 @@ typedef struct IDirect3DVertexShader9Impl { /* IUnknown fields */ const IDirect3DVertexShader9Vtbl *lpVtbl; - LONG ref; - - /* IDirect3DVertexShader9 fields */ - IWineD3DVertexShader *wineD3DVertexShader; - - /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + LONG ref; + struct wined3d_shader *wined3d_shader; + IDirect3DDevice9Ex *parentDevice; } IDirect3DVertexShader9Impl; HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, @@ -483,12 +431,8 @@ /* IUnknown fields */ const IDirect3DPixelShader9Vtbl *lpVtbl; LONG ref; - - /* IDirect3DPixelShader9 fields */ - IWineD3DPixelShader *wineD3DPixelShader; - - /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + struct wined3d_shader *wined3d_shader; + IDirect3DDevice9Ex *parentDevice; } IDirect3DPixelShader9Impl; HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, @@ -502,15 +446,14 @@ * IDirect3DPixelShader implementation structure */ typedef struct IDirect3DQuery9Impl { - /* IUnknown fields */ - const IDirect3DQuery9Vtbl *lpVtbl; + IDirect3DQuery9 IDirect3DQuery9_iface; LONG ref; /* IDirect3DQuery9 fields */ - IWineD3DQuery *wineD3DQuery; + struct wined3d_query *wineD3DQuery; /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + IDirect3DDevice9Ex *parentDevice; } IDirect3DQuery9Impl; HRESULT query_init(IDirect3DQuery9Impl *query, IDirect3DDevice9Impl *device,

1 0

[tkreuzer] 53338: [WIN32K] Fix amd64 build
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 12:31:37 2011 New Revision: 53338 URL: http://svn.reactos.org/svn/reactos?rev=53338&view=rev Log: [WIN32K] Fix amd64 build Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat Aug 20 12:31:37 2011 @@ -480,7 +480,9 @@ return(STATUS_SUCCESS); } +#ifdef _M_IX86 C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE); +#endif // Return on failure #define NT_ROF(x) \ Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat Aug 20 12:31:37 2011 @@ -19,10 +19,17 @@ PBRUSH pbrDefaultBrush = NULL; // FIXME: these should go to floatobj.h or something +#ifdef _M_IX86 #define FLOATOBJ_0 {0x00000000, 0x00000000} #define FLOATOBJ_1 {0x40000000, 0x00000002} #define FLOATOBJ_16 {0x40000000, 0x00000006} #define FLOATOBJ_1_16 {0x40000000, 0xfffffffe} +#else +#define FLOATOBJ_0 0. +#define FLOATOBJ_1 1. +#define FLOATOBJ_16 16. +#define FLOATOBJ_1_16 (1./16.) +#endif static const FLOATOBJ gef0 = FLOATOBJ_0; static const FLOATOBJ gef1 = FLOATOBJ_1; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sat Aug 20 12:31:37 2011 @@ -62,7 +62,7 @@ #define MmMapViewInSessionSpace MmMapViewInSystemSpace -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) #define InterlockedOr16 _InterlockedOr16 #endif

1 0

[tkreuzer] 53337: [CMAKE] - handle stdcall decoration in MSVC set_entrypoint
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 12:29:51 2011 New Revision: 53337 URL: http://svn.reactos.org/svn/reactos?rev=53337&view=rev Log: [CMAKE] - handle stdcall decoration in MSVC set_entrypoint Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53337… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Aug 20 12:29:51 2011 @@ -59,11 +59,17 @@ macro(add_pch _target_name _FILE) endmacro() -function(set_entrypoint MODULE ENTRYPOINT) - if(${ENTRYPOINT} STREQUAL "0") - add_linkerflag(${MODULE} "/NOENTRY") +function(set_entrypoint _module _entrypoint) + if(${_entrypoint} STREQUAL "0") + add_linkerflag(${_module} "/NOENTRY") + elseif(ARCH MATCHES i386) + set(_entrysymbol ${_entrypoint}) + if (${ARGC} GREATER 2) + set(_entrysymbol ${_entrysymbol}@${ARGV2}) + endif() + add_linkerflag(${_module} "/ENTRY:${_entrysymbol}") else() - add_linkerflag(${MODULE} "/ENTRY:${ENTRYPOINT}") + add_linkerflag(${_module} "/ENTRY:${_entrypoint}") endif() endfunction() @@ -79,7 +85,7 @@ add_dependencies(${MODULE} psdk) if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) - set_entrypoint(${MODULE} NtProcessStartup@4) + set_entrypoint(${MODULE} NtProcessStartup 4) elseif (${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) if(IS_UNICODE) @@ -96,7 +102,7 @@ endif(IS_UNICODE) elseif(${TYPE} MATCHES win32dll) # Need this only because mingw library is broken - set_entrypoint(${MODULE} DllMainCRTStartup@12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() @@ -104,16 +110,16 @@ endif() add_linkerflag(${MODULE} "/DLL") elseif(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMainCRTStartup@12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") add_linkerflag(${MODULE} "/DLL") elseif(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMainCRTStartup@12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") add_linkerflag(${MODULE} "/DLL") elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") - set_entrypoint(${MODULE} DriverEntry@8) + set_entrypoint(${MODULE} DriverEntry 8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) add_linkerflag(${MODULE} "/DRIVER")

1 0

[gadamopoulos] 53336: [uxtheme] - Remove a hack that is not needed because it was added to a better place in 53295
by gadamopoulos＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: gadamopoulos Date: Sat Aug 20 11:39:05 2011 New Revision: 53336 URL: http://svn.reactos.org/svn/reactos?rev=53336&view=rev Log: [uxtheme] - Remove a hack that is not needed because it was added to a better place in 53295 Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/msstyles.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/msstyles.c [iso-8859-1] Sat Aug 20 11:39:05 2011 @@ -1285,8 +1285,6 @@ ZeroMemory(pFont, sizeof(LOGFONTW)); hr = MSSTYLES_GetFont (lpCur, lpEnd, &lpCur, pFont); - if (SUCCEEDED (hr)) - pFont->lfHeight = -MulDiv(pFont->lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); return hr; }

1 0

[tkreuzer] 53335: [CRT] guard some inline functions from being used in certain cases
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 11:27:49 2011 New Revision: 53335 URL: http://svn.reactos.org/svn/reactos?rev=53335&view=rev Log: [CRT] guard some inline functions from being used in certain cases Modified: trunk/reactos/include/crt/time.h Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=533… ============================================================================== --- trunk/reactos/include/crt/time.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/time.h [iso-8859-1] Sat Aug 20 11:27:49 2011 @@ -178,7 +178,7 @@ _CRTIMP time_t __cdecl _mkgmtime(struct tm *_Tm); _CRTIMP time_t __cdecl time(time_t *_Time); -#ifndef RC_INVOKED +#if !defined(RC_INVOKED) && !defined(_NO_INLINING) && !defined(_CRTBLD) #ifdef _USE_32BIT_TIME_T #if 0 __CRT_INLINE double __cdecl difftime(time_t _Time1,time_t _Time2) { return _difftime32(_Time1,_Time2); }

1 0

[tkreuzer] 53334: [NTOSKRNL] Fix amd64 build and some warnings
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 10:41:44 2011 New Revision: 53334 URL: http://svn.reactos.org/svn/reactos?rev=53334&view=rev Log: [NTOSKRNL] Fix amd64 build and some warnings Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h trunk/reactos/ntoskrnl/kd64/kdprint.c trunk/reactos/ntoskrnl/ke/amd64/interrupt.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/amd64/page.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Sat Aug 20 10:41:44 2011 @@ -135,20 +135,18 @@ BooleanFlagOn((TrapFrame)->EFlags, EFLAGS_INTERRUPT_MASK) /* Diable interrupts and return whether they were enabled before */ +FORCEINLINE BOOLEAN -NTAPI KeDisableInterrupts(VOID) { - ULONG Flags; - BOOLEAN Return; + ULONG_PTR Flags; /* Get EFLAGS and check if the interrupt bit is set */ Flags = __readeflags(); - Return = (Flags & EFLAGS_INTERRUPT_MASK) ? TRUE: FALSE; /* Disable interrupts */ _disable(); - return Return; + return (Flags & EFLAGS_INTERRUPT_MASK) ? TRUE : FALSE; } /* Restore previous interrupt state */ Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdprint.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] Sat Aug 20 10:41:44 2011 @@ -35,7 +35,7 @@ /* Build the packet header */ DebugIo.ApiNumber = DbgKdPrintStringApi; - DebugIo.ProcessorLevel = KeProcessorLevel; + DebugIo.ProcessorLevel = (USHORT)KeProcessorLevel; DebugIo.Processor = KeGetCurrentPrcb()->Number; DebugIo.u.PrintString.LengthOfString = Length; Header.Length = sizeof(DBGKD_DEBUG_IO); @@ -76,7 +76,7 @@ /* Build the packet header */ DebugIo.ApiNumber = DbgKdGetStringApi; - DebugIo.ProcessorLevel = KeProcessorLevel; + DebugIo.ProcessorLevel = (USHORT)KeProcessorLevel; DebugIo.Processor = KeGetCurrentPrcb()->Number; DebugIo.u.GetString.LengthOfPromptString = Length; DebugIo.u.GetString.LengthOfStringRead = ResponseString->MaximumLength; @@ -115,7 +115,7 @@ /* Copy back the string and return the length */ RtlCopyMemory(ResponseString->Buffer, KdpMessageBuffer, Length); - ResponseString->Length = Length; + ResponseString->Length = (USHORT)Length; /* Success; we don't need to resend */ return FALSE; Modified: trunk/reactos/ntoskrnl/ke/amd64/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/interrup… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/interrupt.c [iso-8859-1] Sat Aug 20 10:41:44 2011 @@ -16,24 +16,6 @@ #include <debug.h> /* FUNCTIONS ****************************************************************/ - - - -BOOLEAN -NTAPI -KeDisableInterrupts(VOID) -{ - ULONG64 Flags; - - /* Get the flags */ - Flags = __readeflags(); - - /* Disable interrupts */ - _disable(); - - return !!(Flags & EFLAGS_INTERRUPT_MASK); -} - BOOLEAN NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Aug 20 10:41:44 2011 @@ -530,7 +530,7 @@ // // Figures out the hardware bits for a PTE // -ULONG +ULONG_PTR FORCEINLINE MiDetermineUserGlobalPteMask(IN PVOID PointerPte) { Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sat Aug 20 10:41:44 2011 @@ -120,7 +120,7 @@ FORCEINLINE MiIsHyperspaceAddress(PVOID Address) { - return ((ULONG64)Address >= HYPER_SPACE && + return ((ULONG64)Address >= HYPER_SPACE && (ULONG64)Address <= HYPER_SPACE_END); } @@ -147,7 +147,7 @@ MMPTE TmplPte, *Pte; /* Check if we need hypersapce mapping */ - if (Address < MmSystemRangeStart && + if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) { UNIMPLEMENTED; @@ -313,7 +313,7 @@ { MMPTE Pte; Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return Pte.u.Hard.Valid; + return (BOOLEAN)Pte.u.Hard.Valid; } BOOLEAN @@ -469,7 +469,7 @@ /* Return information to the caller */ if (WasDirty) - *WasDirty = OldPte.u.Hard.Dirty;; + *WasDirty = (BOOLEAN)OldPte.u.Hard.Dirty;; if (Page) *Page = Pfn; @@ -537,7 +537,7 @@ Pte = MiGetPteForProcess(Process, Address, TRUE); -DPRINT1("MmCreateVirtualMappingUnsafe, Address=%p, TmplPte=%p, Pte=%p\n", +DPRINT1("MmCreateVirtualMappingUnsafe, Address=%p, TmplPte=%p, Pte=%p\n", Address, TmplPte.u.Long, Pte); if (InterlockedExchangePte(Pte, TmplPte)) @@ -592,13 +592,13 @@ /* No page colors yet */ Process->NextPageColor = 0; - + /* Setup the hyperspace lock */ KeInitializeSpinLock(&Process->HyperSpaceLock); /* Lock PFN database */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - + /* Get a page for the table base and for hyperspace */ TableBasePfn = MiRemoveAnyPage(0); HyperPfn = MiRemoveAnyPage(0); @@ -647,14 +647,14 @@ /* Now write the PTE/PDE entry for hyperspace itself */ TempPte = ValidKernelPte; TempPte.u.Hard.PageFrameNumber = HyperPfn; - TableIndex = MiAddressToPxi(HYPER_SPACE); + TableIndex = MiAddressToPxi((PVOID)HYPER_SPACE); SystemTable[TableIndex] = TempPte; /* Sanity check */ ASSERT(MiAddressToPxi(MmHyperSpaceEnd) > TableIndex); /* Now do the x86 trick of making the PDE a page table itself */ - TableIndex = MiAddressToPxi(PTE_BASE); + TableIndex = MiAddressToPxi((PVOID)PTE_BASE); TempPte.u.Hard.PageFrameNumber = TableBasePfn; SystemTable[TableIndex] = TempPte;

1 0

[tkreuzer] 53333: [ASM] - prefix labels only on x86 - improve syscall stub code
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 10:39:28 2011 New Revision: 53333 URL: http://svn.reactos.org/svn/reactos?rev=53333&view=rev Log: [ASM] - prefix labels only on x86 - improve syscall stub code Modified: trunk/reactos/include/asm/asm.inc trunk/reactos/include/asm/syscalls.inc Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=53… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Sat Aug 20 10:39:28 2011 @@ -32,13 +32,21 @@ /* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ .PROC MACRO name +#ifdef _M_IX86 _&name PROC +#else + &name PROC FRAME +#endif ENDM #define FUNC .PROC /* ... and .ENDP, replacing ENDP */ .ENDP MACRO name +#ifdef _M_IX86 _&name ENDP +#else + &name ENDP +#endif ENDM #define ENDFUNC .ENDP Modified: trunk/reactos/include/asm/syscalls.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/syscalls.inc?r… ============================================================================== --- trunk/reactos/include/asm/syscalls.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/syscalls.inc [iso-8859-1] Sat Aug 20 10:39:28 2011 @@ -3,12 +3,14 @@ #define KUSER_SHARED_SYSCALL HEX(7ffe0300) #define KGDT_R0_CODE 8 MACRO(STUBCODE_U, SyscallId, StackBytes) + FPO 0, 0, 0, 0, 0, FRAME_FPO mov eax, SyscallId mov ecx, KUSER_SHARED_SYSCALL call dword ptr [ecx] ret StackBytes ENDM MACRO(STUBCODE_K, SyscallId, StackBytes) + FPO 0, 0, 0, 0, 0, FRAME_FPO mov eax, SyscallId lea edx, [esp + 4] pushfd @@ -18,12 +20,14 @@ ENDM #elif defined(_M_AMD64) MACRO(STUBCODE_U, SyscallId, StackBytes) + .ENDPROLOG mov eax, SyscallId mov r10, rcx syscall ret StackBytes ENDM MACRO(STUBCODE_K, SyscallId, StackBytes) + .ENDPROLOG mov eax, SyscallId call KiSystemService ret StackBytes @@ -74,7 +78,6 @@ MACRO(START_PROC, Name, Stackbytes) PUBLIC _&Name&@&Stackbytes .PROC &Name&@&Stackbytes - FPO 0, 0, 0, 0, 0, FRAME_FPO ENDM MACRO(END_PROC, Name, Stackbytes) .ENDP &Name&@&Stackbytes @@ -87,7 +90,6 @@ MACRO(START_PROC, Name, Stackbytes) PUBLIC &Name .PROC &Name - FPO 0, 0, 0, 0, 0, FRAME_FPO ENDM MACRO(END_PROC, Name, Stackbytes) .ENDP &Name

1 0

[cgutman] 53332: [HAL] - Debugging changes
by cgutman＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: cgutman Date: Sat Aug 20 01:47:25 2011 New Revision: 53332 URL: http://svn.reactos.org/svn/reactos?rev=53332&view=rev Log: [HAL] - Debugging changes Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] Sat Aug 20 01:47:25 2011 @@ -185,7 +185,7 @@ /* Fail if we couldn't map it */ if (!Header) { - DbgPrint("HAL: Failed to map ACPI table.\n"); + DPRINT1("HAL: Failed to map ACPI table.\n"); return NULL; } @@ -304,7 +304,7 @@ if (!Header) { /* Game over */ - DbgPrint("HAL: Failed to map ACPI table.\n"); + DPRINT1("HAL: Failed to map ACPI table.\n"); return NULL; } @@ -589,7 +589,7 @@ /* Make sure we found it */ if (!ComponentEntry) { - DbgPrint("**** HalpAcpiFindRsdtPhase0: did NOT find RSDT\n"); + DPRINT1("**** HalpAcpiFindRsdtPhase0: did NOT find RSDT\n"); return STATUS_NOT_FOUND; } @@ -675,7 +675,7 @@ if (!MappedAddress) { /* Fail, no memory */ - DbgPrint("HAL: Failed to map RSDT\n"); + DPRINT1("HAL: Failed to map RSDT\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -715,7 +715,7 @@ if (!MappedAddress) { /* Fail, no memory */ - DbgPrint("HAL: Couldn't remap RSDT\n"); + DPRINT1("HAL: Couldn't remap RSDT\n"); return STATUS_INSUFFICIENT_RESOURCES; } } @@ -725,7 +725,7 @@ if (!Rsdt) { /* Fail, no memory */ - DbgPrint("HAL: Couldn't remap RSDT\n"); + DPRINT1("HAL: Couldn't remap RSDT\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -790,7 +790,7 @@ PHYSICAL_ADDRESS PhysicalAddress; /* Only do this once */ - DPRINT1("You are booting the ACPI HAL!\n"); + DPRINT("You are booting the ACPI HAL!\n"); if (HalpProcessedACPIPhase0) return STATUS_SUCCESS; /* Setup the ACPI table cache */ @@ -802,7 +802,7 @@ if (!Fadt) { /* Fail */ - DbgPrint("HAL: Didn't find the FACP\n"); + DPRINT1("HAL: Didn't find the FACP\n"); return STATUS_NOT_FOUND; } @@ -982,12 +982,12 @@ /* Get ACPI resources */ HalpAcpiDetectResourceListSize(&Count); - DPRINT1("Resource count: %d\n", Count); + DPRINT("Resource count: %d\n", Count); /* Compute size of the list and allocate it */ ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List[0].Descriptors) + (Count * sizeof(IO_RESOURCE_DESCRIPTOR)); - DPRINT1("Resource list size: %d\n", ListSize); + DPRINT("Resource list size: %d\n", ListSize); RequirementsList = ExAllocatePoolWithTag(PagedPool, ListSize, ' laH'); if (RequirementsList) { Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] Sat Aug 20 01:47:25 2011 @@ -60,7 +60,7 @@ PPDO_EXTENSION PdoExtension; PDEVICE_OBJECT DeviceObject, PdoDeviceObject, AttachedDevice; PDESCRIPTION_HEADER Wdrt; - DbgPrint("HAL: PnP Driver ADD!\n"); + DPRINT("HAL: PnP Driver ADD!\n"); /* Create the FDO */ Status = IoCreateDevice(DriverObject, @@ -110,7 +110,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - DbgPrint("HAL: Could not create ACPI device object status=0x%08x\n", Status); + DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); return Status; } @@ -140,7 +140,7 @@ IoInvalidateDeviceRelations(TargetDevice, BusRelations); /* Return status */ - DPRINT1("Device added %lx\n", Status); + DPRINT("Device added %lx\n", Status); return Status; } @@ -813,7 +813,7 @@ HalpDispatchWmi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DbgPrint("HAL: PnP Driver WMI!\n"); + DPRINT1("HAL: PnP Driver WMI!\n"); while (TRUE); return STATUS_SUCCESS; } @@ -823,7 +823,7 @@ HalpDispatchPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DbgPrint("HAL: PnP Driver Power!\n"); + DPRINT1("HAL: PnP Driver Power!\n"); return STATUS_SUCCESS; }

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
50
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 August 2011