Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 36433: - Call the CheckForHang handler at DISPATCH_LEVEL - Implement MiniReset
by cgutman＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cgutman Date: Tue Sep 23 13:44:17 2008 New Revision: 36433 URL: http://svn.reactos.org/svn/reactos?rev=36433&view=rev Log: - Call the CheckForHang handler at DISPATCH_LEVEL - Implement MiniReset Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Sep 23 13:44:17 2008 @@ -595,12 +595,43 @@ */ { BOOLEAN Ret = FALSE; - + KIRQL OldIrql; + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler) Ret = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext); + KeLowerIrql(OldIrql); return Ret; +} + +NDIS_STATUS +MiniReset( + PLOGICAL_ADAPTER Adapter, + PBOOLEAN AddressingReset) +/* + * FUNCTION: Resets the miniport + * ARGUMENTS: + * Adapter = Pointer to the logical adapter object + * AddressingReset = Set to TRUE if we need to call MiniportSetInformation later + * RETURNS: + * Status of the operation + */ +{ + NDIS_STATUS Status = NDIS_STATUS_FAILURE; + KIRQL OldIrql; + + /* FIXME: What should we return if there isn't a reset handler? */ + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler) + Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, + AddressingReset); + KeLowerIrql(OldIrql); + + return Status; }

1 0

[cgutman] 36432: - Implement MiniCheckForHang
by cgutman＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cgutman Date: Tue Sep 23 13:24:19 2008 New Revision: 36432 URL: http://svn.reactos.org/svn/reactos?rev=36432&view=rev Log: - Implement MiniCheckForHang Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Sep 23 13:24:19 2008 @@ -581,6 +581,26 @@ /* FIXME: Wait in pending case! */ return NdisStatus; +} + +BOOLEAN +MiniCheckForHang( PLOGICAL_ADAPTER Adapter ) +/* + * FUNCTION: Checks to see if the miniport is hung + * ARGUMENTS: + * Adapter = Pointer to the logical adapter object + * RETURNS: + * TRUE if the miniport is hung + * FALSE if the miniport is not hung + */ +{ + BOOLEAN Ret = FALSE; + + if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler) + Ret = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext); + + return Ret; }

1 0

[cfinck] 36431: Maciej Bialas (bjauy@o2.pl): - Polish translation for People Map
by cfinck＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cfinck Date: Tue Sep 23 13:18:31 2008 New Revision: 36431 URL: http://svn.reactos.org/svn/reactos?rev=36431&view=rev Log: Maciej Bialas (bjauy(a)o2.pl): - Polish translation for People Map Added: trunk/web/reactos.org/htdocs/peoplemap/lang/pl.inc.php (with props) Modified: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php Added: trunk/web/reactos.org/htdocs/peoplemap/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/pl.inc.php (added) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/pl.inc.php [iso-8859-1] Tue Sep 23 13:18:31 2008 @@ -1,0 +1,53 @@ +<?php +/* + PROJECT: People Map of the ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/peoplemap/lang/pl.inc.php + PURPOSE: Translation + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + TRANSLATOR: Maciej Bialas +*/ + + /**** English resources (charset=utf-8) ****/ + $peoplemap_langres["language"] = "JÄzyk"; + + $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Strona gÅÃ³wna</a> > Mapa OsÃ³b ReactOS'; + $peoplemap_langres["title"] = "Mapa OsÃ³b ReactOS"; + $peoplemap_langres["intro"] = "PoniÅ¼sza mapa pokazuje poÅoÅ¼enie deweloperÃ³w i uÅ¼ytkownikÃ³w systemu ReactOS."; + + $peoplemap_langres["filter"] = "Filtruj poprzez grupÄ uÅ¼ytkownikÃ³w"; + $peoplemap_langres["filter_intro"] = "Zaznacz pole obok danej grupy, aby pokazaÄ lub ukryÄ wszystkich jej czÅonkÃ³w na Mapie."; + + $peoplemap_langres["add"] = "Szukaj uÅ¼ytkownika i dodaj go do Mapy"; + $peoplemap_langres["add_username"] = "Nazwa uÅ¼ytkownika"; + $peoplemap_langres["add_fullname"] = "ImiÄ i nazwisko"; + + $peoplemap_langres["mylocation"] = "Moje poÅoÅ¼enie na Mapie"; + $peoplemap_langres["mylocation_login"] = "Musisz byÄ zalogowany/a, aby ustawiÄ swoje poÅoÅ¼enie."; + $peoplemap_langres["mylocation_login_page"] = "Strona logowania"; + $peoplemap_langres["mylocation_intro"] = "Tutaj moÅ¼esz ustawiÄ Twoje poÅoÅ¼enie na mapie. MoÅ¼esz to uczyniÄ na kilka sposobÃ³w:"; + $peoplemap_langres["mylocation_marker_intro"] = "UÅ¼yj Znacznika i przeciÄgnij go w odpowiednie miejsce na Mapie."; + $peoplemap_langres["mylocation_marker_button"] = "UÅ¼yj Znacznika"; + $peoplemap_langres["mylocation_marker_save_intro"] = "NaciÅnij poniÅ¼szy przycisk<br/>aby zachowaÄ Twoje poÅoÅ¼enie."; + $peoplemap_langres["mylocation_marker_save_button"] = "Zapisz moje poÅoÅ¼enie"; + $peoplemap_langres["mylocation_marker_cancel"] = "Anuluj"; + $peoplemap_langres["mylocation_coordinates_intro"] = "WprowadÅº wspÃ³ÅrzÄdne w stopniach (dziesiÄtnie):"; + $peoplemap_langres["mylocation_coordinates_button"] = "Ustaw"; + $peoplemap_langres["mylocation_coordinates_invalid"] = "To nie sÄ prawidÅowe wspÃ³ÅrzÄdne!"; + $peoplemap_langres["mylocation_delete_intro"] = "UÅ¼ywajÄc poniÅ¼szego przycisku moÅ¼esz usunÄÄ Twoje poÅoÅ¼enie z Mapy."; + $peoplemap_langres["mylocation_delete_button"] = "UsuÅ moje poÅoÅ¼enie"; + + $peoplemap_langres["latitude"] = "SzerokoÅÄ geograficzna"; + $peoplemap_langres["longitude"] = "DÅugoÅÄ geograficzna"; + $peoplemap_langres["removefrommap"] = "UsuÅ uÅ¼ytkownika z Mapy"; + $peoplemap_langres["minquerylength"] = "WprowadÅº minimum 3 znaki."; + $peoplemap_langres["nousers"] = "Brak danych o poÅoÅ¼eniu tego uÅ¼ytkownika!"; + $peoplemap_langres["activatejs"] = "Musisz wÅÄczyÄ JavaScript aby korzystaÄ z Mapy OsÃ³b!"; + $peoplemap_langres["unsupportedbrowser"] = "Mapa OsÃ³b nie jest wspierana przez TwojÄ przeglÄdarkÄ."; + + $peoplemap_langres["count1"] = "PokazujÄ <strong>"; + $peoplemap_langres["count2"] = " z "; + $peoplemap_langres["count3"] = "</strong> uÅ¼ytkownikÃ³w, ktÃ³rzy podali swoje poÅoÅ¼enie (spoÅrÃ³d wszystkich "; + $peoplemap_langres["count4"] = " uÅ¼ytkownikÃ³w)"; + $peoplemap_langres["icons"] = "Rodzaj ikony"; +?> Propchange: trunk/web/reactos.org/htdocs/peoplemap/lang/pl.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/languages.inc.php [iso-8859-1] Tue Sep 23 13:18:31 2008 @@ -12,5 +12,6 @@ "en" => "English", "de" => "Deutsch (German)", "es" => "EspaÃ±ol (Spanish)", + "pl" => "Polski (Polish)", ); ?>

1 0

[cgutman] 36430: - We must check that NdisWrapperHandle is non-NULL to see if NdisMInitializeWrapper succeeded
by cgutman＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cgutman Date: Tue Sep 23 13:07:26 2008 New Revision: 36430 URL: http://svn.reactos.org/svn/reactos?rev=36430&view=rev Log: - We must check that NdisWrapperHandle is non-NULL to see if NdisMInitializeWrapper succeeded Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Tue Sep 23 13:07:26 2008 @@ -939,6 +939,11 @@ RegistryPath, NULL); + if (!NdisWrapperHandle) { + NDIS_DbgPrint(MIN_TRACE, ("NdisMInitializeWrapper() failed\n")); + return STATUS_UNSUCCESSFUL; + } + DriverInfo.NdisWrapperHandle = NdisWrapperHandle; DriverInfo.NdisMacHandle = NULL; InitializeListHead(&DriverInfo.AdapterListHead);

1 0

[gbrunmar] 36429: D3D9: * More init values when creating a texture
by gbrunmar＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: gbrunmar Date: Tue Sep 23 12:01:40 2008 New Revision: 36429 URL: http://svn.reactos.org/svn/reactos?rev=36429&view=rev Log: D3D9: * More init values when creating a texture Added: trunk/reactos/dll/directx/d3d9/d3d9_basetexture.h (with props) trunk/reactos/dll/directx/d3d9/d3d9_resource.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_texture.c (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h trunk/reactos/dll/directx/d3d9/d3d9_resource.h trunk/reactos/dll/directx/d3d9/d3d9_texture.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] Tue Sep 23 12:01:40 2008 @@ -23,7 +23,9 @@ <file>d3d9_impl.c</file> <file>d3d9_mipmap.c</file> <file>d3d9_puredevice.c</file> + <file>d3d9_resource.c</file> <file>d3d9_swapchain.c</file> + <file>d3d9_texture.c</file> <file>adapter.c</file> <file>device.c</file> <file>format.c</file> Added: trunk/reactos/dll/directx/d3d9/d3d9_basetexture.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_basetexture.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_basetexture.h [iso-8859-1] Tue Sep 23 12:01:40 2008 @@ -1,0 +1,43 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_basetexture.h + * PURPOSE: Work-around for gcc warning, DO NOT USE FOR ANYTHING ELSE!!! + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ +#ifndef _D3D9_BASETEXTURE_H_ +#define _D3D9_BASETEXTURE_H_ + +// Work-around for: +// "warning: 'FilterType' is narrower than values of its type" +#if __GNUC__ >=3 + #pragma GCC system_header +#endif + +struct IDirect3DBaseTexture9Vtbl; + +#pragma pack(push) +#pragma pack(1) +typedef struct _Direct3DBaseTexture9_INT +{ +/* 0x0000 */ IDirect3DBaseTexture9Vtbl* lpVtbl; +/* 0x0004 */ DWORD dwUnknown04; +/* 0x0008 */ Direct3DResource9_INT BaseResource; +/* 0x004c */ DWORD dwUnknown4c; +/* 0x0050 */ D3DFORMAT Format; +/* 0x0054 */ DWORD Usage; +/* 0x0058 */ WORD MipMapLevels; + union { +/* 0x005a */ D3DTEXTUREFILTERTYPE FilterType : 8; + struct + { +/* 0x005a */ DWORD dwFilterType : 8; +/* 0x005b */ BOOL bIsAutoGenMipMap : 8; +/* 0x005c */ DWORD MipMapLevels2 : 16; + }; + }; +/* 0x005e */ WORD wPaletteIndex; +} Direct3DBaseTexture9_INT; +#pragma pack(pop) + +#endif Propchange: trunk/reactos/dll/directx/d3d9/d3d9_basetexture.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Tue Sep 23 12:01:40 2008 @@ -510,7 +510,7 @@ if (D3DFMT_UNKNOWN == Format) return InvalidCall(This, "Invalid Format parameter specified, D3DFMT_UNKNOWN is not a valid Format"); - if (NULL == pSharedHandle) + if (NULL != pSharedHandle) { UNIMPLEMENTED; return InvalidCall(This, "Invalid pSharedHandle parameter specified, only NULL is supported at the moment"); Modified: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_mipm… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c [iso-8859-1] Tue Sep 23 12:01:40 2008 @@ -246,13 +246,16 @@ return E_OUTOFMEMORY; } + InitDirect3DBaseTexture9(&pThisTexture->BaseTexture, (IDirect3DBaseTexture9Vtbl*)&D3D9MipMap_Vtbl, Usage, Levels, Format, Pool, pDevice, RT_EXTERNAL); + pThisTexture->lpVtbl = &D3D9MipMap_Vtbl; + pThisTexture->Usage = Usage; pThisTexture->dwWidth = Width; pThisTexture->dwHeight = Height; pThisTexture->Format = Format; - *ppTexture = (IDirect3DTexture9*)pThisTexture->lpVtbl; + *ppTexture = (IDirect3DTexture9*)&pThisTexture->lpVtbl; UNIMPLEMENTED; return D3D_OK; Modified: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_mipm… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h [iso-8859-1] Tue Sep 23 12:01:40 2008 @@ -19,7 +19,7 @@ /* 0x0064 */ LPDWORD dwUnknown64; /* 0x0068 */ D3DFORMAT Format; /* 0x006c */ DWORD dwUnknown6c; -/* 0x0070 */ DWORD dwUnknown70; +/* 0x0070 */ DWORD Usage; /* 0x0074 */ DWORD dwUnknown74; /* 0x0078 */ DWORD dwUnknown78; /* 0x007c */ DWORD dwUnknown7c; Added: trunk/reactos/dll/directx/d3d9/d3d9_resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_reso… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_resource.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_resource.c [iso-8859-1] Tue Sep 23 12:01:40 2008 @@ -1,0 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_resource.c + * PURPOSE: d3d9.dll internal resource functions + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ +#include "d3d9_resource.h" +#include "d3d9_device.h" + +void InitDirect3DResource9(Direct3DResource9_INT* pResource, D3DPOOL Pool, LPDIRECT3DDEVICE9_INT pBaseDevice, enum REF_TYPE RefType) +{ + InitD3D9BaseObject(&pResource->BaseObject, RefType, (IUnknown*)&pBaseDevice->lpVtbl); + + pResource->Pool = Pool; +} Propchange: trunk/reactos/dll/directx/d3d9/d3d9_resource.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_reso… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_resource.h [iso-8859-1] Tue Sep 23 12:01:40 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS ReactX - * FILE: dll/directx/d3d9/d3d9_mipmap.h + * FILE: dll/directx/d3d9/d3d9_resource.h * PURPOSE: d3d9.dll internal resource structures * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> */ @@ -20,10 +20,10 @@ /* 0x0030 */ DWORD dwUnknown30; /* 0x0034 */ DWORD dwUnknown34; /* 0x0038 */ D3DPOOL Pool; -/* 0x003c */ DWORD dwUnknown3c; +/* 0x003c */ LPDWORD dwUnknown3c; /* 0x0040 */ LPDWORD dwUnknown40; } Direct3DResource9_INT; - +void InitDirect3DResource9(Direct3DResource9_INT* pResource, D3DPOOL Pool, struct _Direct3DDevice9_INT* pDevice, enum REF_TYPE RefType); #endif // _D3D9_RESOURCE_H_ Added: trunk/reactos/dll/directx/d3d9/d3d9_texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_text… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_texture.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_texture.c [iso-8859-1] Tue Sep 23 12:01:40 2008 @@ -1,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_texture.c + * PURPOSE: d3d9.dll internal texture surface functions + * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> + */ +#include "d3d9_texture.h" + +void InitDirect3DBaseTexture9(Direct3DBaseTexture9_INT* pBaseTexture, + IDirect3DBaseTexture9Vtbl* pVtbl, + DWORD Usage, + UINT Levels, + D3DFORMAT Format, + D3DPOOL Pool, + struct _Direct3DDevice9_INT* pDevice, + enum REF_TYPE RefType) +{ + InitDirect3DResource9(&pBaseTexture->BaseResource, Pool, pDevice, RefType); + + pBaseTexture->lpVtbl = pVtbl; + pBaseTexture->Format = Format; + pBaseTexture->wPaletteIndex = 0xFFFF; + pBaseTexture->Usage = Usage; + pBaseTexture->MipMapLevels = + pBaseTexture->MipMapLevels2 = (WORD)Levels; + + pBaseTexture->FilterType = D3DTEXF_LINEAR; + pBaseTexture->bIsAutoGenMipMap = (Usage & D3DUSAGE_AUTOGENMIPMAP) != 0; +} Propchange: trunk/reactos/dll/directx/d3d9/d3d9_texture.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_texture.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_text… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_texture.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_texture.h [iso-8859-1] Tue Sep 23 12:01:40 2008 @@ -9,19 +9,17 @@ #define _D3D9_TEXTURE_H_ #include "d3d9_resource.h" +#include "d3d9_basetexture.h" -typedef struct _Direct3DBaseTexture9_INT -{ -/* 0x0000 */ struct IDirect3DBaseTexture9Vtbl* lpVtbl; -/* 0x0004 */ DWORD dwUnknown04; -/* 0x0008 */ Direct3DResource9_INT BaseResource; -/* 0x004c */ DWORD dwUnknown4c; -/* 0x0050 */ DWORD dwUnknown50; -/* 0x0054 */ DWORD Usage; -/* 0x0058 */ WORD MipMapLevels; -/* 0x005a */ WORD dUnknown5a; -/* 0x005c */ WORD MipMapLevels2; -/* 0x005e */ WORD dUnknown5e; -} Direct3DBaseTexture9_INT; +struct IDirect3DBaseTexture9Vtbl; + +void InitDirect3DBaseTexture9(Direct3DBaseTexture9_INT* pBaseTexture, + IDirect3DBaseTexture9Vtbl* pVtbl, + DWORD Usage, + UINT Levels, + D3DFORMAT Format, + D3DPOOL Pool, + struct _Direct3DDevice9_INT* pDevice, + enum REF_TYPE RefType); #endif // _D3D9_TEXTURE_H_

1 0

[sginsberg] 36428: - Add basic tracing to CmpReferenceKeyControlBlock, CmpDereferenceKeyControlBlock and CmpDereferenceKeyControlBlockWithLock
by sginsberg＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: sginsberg Date: Tue Sep 23 09:15:56 2008 New Revision: 36428 URL: http://svn.reactos.org/svn/reactos?rev=36428&view=rev Log: - Add basic tracing to CmpReferenceKeyControlBlock, CmpDereferenceKeyControlBlock and CmpDereferenceKeyControlBlockWithLock Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Tue Sep 23 09:15:56 2008 @@ -354,6 +354,9 @@ NTAPI CmpReferenceKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { + CMTRACE(CM_REFERENCE_DEBUG, + "%s - Referencing KCB: %p\n", __FUNCTION__, Kcb); + /* Check if this is the KCB's first reference */ if (Kcb->RefCount == 0) { @@ -570,6 +573,8 @@ { LONG OldRefCount, NewRefCount; ULONG ConvKey; + CMTRACE(CM_REFERENCE_DEBUG, + "%s - Dereferencing KCB: %p\n", __FUNCTION__, Kcb); /* Get the ref count and update it */ OldRefCount = *(PLONG)&Kcb->RefCount; @@ -602,6 +607,9 @@ CmpDereferenceKeyControlBlockWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively) { + CMTRACE(CM_REFERENCE_DEBUG, + "%s - Dereferencing KCB: %p\n", __FUNCTION__, Kcb); + /* Sanity check */ ASSERT_KCB_VALID(Kcb);

1 0

[fireball] 36427: - In success cases of NtAllocateVirtualMemory, return the real (page rounded!) base address and region size, not the possibly unaligned pointer and length which were passed to the function. These cases were hit when a region of memory was previously reserved, then a commit request came with unaligned base address and length, which match that previously reserved region after aligning.
by fireball＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: fireball Date: Tue Sep 23 07:41:02 2008 New Revision: 36427 URL: http://svn.reactos.org/svn/reactos?rev=36427&view=rev Log: - In success cases of NtAllocateVirtualMemory, return the real (page rounded!) base address and region size, not the possibly unaligned pointer and length which were passed to the function. These cases were hit when a region of memory was previously reserved, then a commit request came with unaligned base address and length, which match that previously reserved region after aligning. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Tue Sep 23 07:41:02 2008 @@ -727,6 +727,15 @@ MmUnlockAddressSpace(AddressSpace); ObDereferenceObject(Process); DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + + /* Give the caller rounded BaseAddress and area length */ + if (NT_SUCCESS(Status)) + { + *UBaseAddress = BaseAddress; + *URegionSize = RegionSize; + DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); + } + return(Status); } else if (MemoryAreaLength >= RegionSize) @@ -749,6 +758,15 @@ MmUnlockAddressSpace(AddressSpace); ObDereferenceObject(Process); DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + + /* Give the caller rounded BaseAddress and area length */ + if (NT_SUCCESS(Status)) + { + *UBaseAddress = BaseAddress; + *URegionSize = RegionSize; + DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); + } + return(Status); } else

1 0

[fireball] 36425: [FORMATTING] - Apply standard header.
by fireball＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: fireball Date: Tue Sep 23 05:47:10 2008 New Revision: 36425 URL: http://svn.reactos.org/svn/reactos?rev=36425&view=rev Log: [FORMATTING] - Apply standard header. Modified: trunk/reactos/base/system/smss/client.c trunk/reactos/base/system/smss/debug.c trunk/reactos/base/system/smss/init.c trunk/reactos/base/system/smss/initdosdev.c trunk/reactos/base/system/smss/initenv.c trunk/reactos/base/system/smss/initheap.c trunk/reactos/base/system/smss/initmv.c trunk/reactos/base/system/smss/initobdir.c trunk/reactos/base/system/smss/initpage.c trunk/reactos/base/system/smss/initreg.c trunk/reactos/base/system/smss/initrun.c trunk/reactos/base/system/smss/initss.c trunk/reactos/base/system/smss/initwkdll.c trunk/reactos/base/system/smss/print.c trunk/reactos/base/system/smss/smapi.c trunk/reactos/base/system/smss/smapicomp.c trunk/reactos/base/system/smss/smapiexec.c trunk/reactos/base/system/smss/smapiquery.c trunk/reactos/base/system/smss/smss.c Modified: trunk/reactos/base/system/smss/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/client.c?… ============================================================================== --- trunk/reactos/base/system/smss/client.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/client.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * client.c - Session Manager client Management - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- - */ +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/client.c + * PURPOSE: Client management. + * PROGRAMMERS: ReactOS Development Team + */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #include <sm/helper.h> Modified: trunk/reactos/base/system/smss/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/debug.c?r… ============================================================================== --- trunk/reactos/base/system/smss/debug.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/debug.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * debug.c - Session Manager debug messages switch and router - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/debug.c + * PURPOSE: Debug messages switch and router. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/init.c?re… ============================================================================== --- trunk/reactos/base/system/smss/init.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/init.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * init.c - Session Manager initialization - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/init.c + * PURPOSE: Initialization. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/initdosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initdosde… ============================================================================== --- trunk/reactos/base/system/smss/initdosdev.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initdosdev.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,29 +1,12 @@ -/* $Id$ - * - * initdosdev.c - Define symbolic links to kernel devices (MS-DOS names). - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/initdosdev.c + * PURPOSE: Define symbolic links to kernel devices (MS-DOS names). + * PROGRAMMERS: ReactOS Development Team */ +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/initenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initenv.c… ============================================================================== --- trunk/reactos/base/system/smss/initenv.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initenv.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ /* - * initenv.c - Environment initialization - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/initenv.c + * PURPOSE: Environment initialization. + * PROGRAMMERS: ReactOS Development Team */ +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/initheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initheap.… ============================================================================== --- trunk/reactos/base/system/smss/initheap.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initheap.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,29 +1,12 @@ -/* $Id$ - * - * initenv.c - Create the SM private heap - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/initheap.c + * PURPOSE: Create the SM private heap. + * PROGRAMMERS: ReactOS Development Team */ +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/initmv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initmv.c?… ============================================================================== --- trunk/reactos/base/system/smss/initmv.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initmv.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,14 +1,10 @@ -/* $Id$ - * - * PROJECT: ReactOS Operating System - * LICENSE: GPL - See COPYING in the top level directory +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory * FILE: base/system/smss/initmv.c * PURPOSE: Process the file rename list. - * PROGRAMMERS: Dmitry Philippov (shedon(a)mail.ru) - * UPDATE HISTORY: - * Created 13/08/2006 + * PROGRAMMERS: ReactOS Development Team */ - /* INCLUDES ******************************************************************/ #include "smss.h" Modified: trunk/reactos/base/system/smss/initobdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initobdir… ============================================================================== --- trunk/reactos/base/system/smss/initobdir.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initobdir.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * initobdir.c - Session Manager object directories - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/initobdir.c + * PURPOSE: Object directories. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/initpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initpage.… ============================================================================== --- trunk/reactos/base/system/smss/initpage.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initpage.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,27 +1,12 @@ /* - * initpage.c - - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/initpage.c + * PURPOSE: Paging file support. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/initreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initreg.c… ============================================================================== --- trunk/reactos/base/system/smss/initreg.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initreg.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,29 +1,12 @@ -/* $Id$ - * - * initenv.c - Hive loading - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/initreg.c + * PURPOSE: Hive loading. + * PROGRAMMERS: ReactOS Development Team */ +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/initrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initrun.c… ============================================================================== --- trunk/reactos/base/system/smss/initrun.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initrun.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,29 +1,12 @@ -/* $Id$ - * - * initrun.c - Run all programs in the boot execution list - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/initrun.c + * PURPOSE: Run all programs in the boot execution list. + * PROGRAMMERS: ReactOS Development Team */ +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/initss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initss.c?… ============================================================================== --- trunk/reactos/base/system/smss/initss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initss.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * initss.c - Load the subsystems - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/initss.c + * PURPOSE: Load the subsystems. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/initwkdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initwkdll… ============================================================================== --- trunk/reactos/base/system/smss/initwkdll.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initwkdll.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,29 +1,12 @@ -/* $Id$ - * - * initwkdll.c - Load the well known DLLs - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/initwkdll.c + * PURPOSE: Load the well known DLLs. + * PROGRAMMERS: ReactOS Development Team */ +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/print.c?r… ============================================================================== --- trunk/reactos/base/system/smss/print.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/print.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * print.c - Print on the blue screen - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/print.c + * PURPOSE: Print on the blue screen. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/smapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?r… ============================================================================== --- trunk/reactos/base/system/smss/smapi.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapi.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,10 +1,12 @@ -/* $Id$ - * - * smapi.c - \SmApiPort LPC port message management - * - * Reactos Session Manager - * - */ +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/print.c + * PURPOSE: \SmApiPort LPC port message management. + * PROGRAMMERS: ReactOS Development Team + */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/smapicomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapicomp… ============================================================================== --- trunk/reactos/base/system/smss/smapicomp.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapicomp.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * smapicomp.c - SM_API_COMPLETE_SESSION - * - * Reactos Session Manager - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/smapicomp.c + * PURPOSE: SM_API_COMPLETE_SESSION. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/smapiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapiexec… ============================================================================== --- trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * smapiexec.c - SM_API_EXECUTE_PROGRAM - * - * Reactos Session Manager - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/smapiexec.c + * PURPOSE: SM_API_EXECUTE_PROGRAM. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/smapiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapiquer… ============================================================================== --- trunk/reactos/base/system/smss/smapiquery.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapiquery.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * smapiquery.c - SM_API_QUERY_INFORMATION - * - * Reactos Session Manager - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/smapiquery.c + * PURPOSE: SM_API_QUERY_INFORMATION. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG Modified: trunk/reactos/base/system/smss/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.c?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.c [iso-8859-1] Tue Sep 23 05:47:10 2008 @@ -1,28 +1,12 @@ -/* $Id$ - * - * smss.c - Session Manager - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- +/* + * PROJECT: ReactOS Session Manager + * LICENSE: GPL v2 or later - See COPYING in the top level directory + * FILE: base/system/smss/smss.c + * PURPOSE: Initialization routine. + * PROGRAMMERS: ReactOS Development Team */ + +/* INCLUDES ******************************************************************/ #include "smss.h" #include <reactos/buildno.h>

1 0

[arty] 36424: Didn't notice that bufferSize is used by RegQueryValueEx. Now we count in bytes with bufferSize and count in chars just in the subscript. Noticed by Christoph_Vw
by arty＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: arty Date: Tue Sep 23 05:17:27 2008 New Revision: 36424 URL: http://svn.reactos.org/svn/reactos?rev=36424&view=rev Log: Didn't notice that bufferSize is used by RegQueryValueEx. Now we count in bytes with bufferSize and count in chars just in the subscript. Noticed by Christoph_Vw Modified: trunk/reactos/base/system/winlogon/screensaver.c Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] Tue Sep 23 05:17:27 2008 @@ -243,7 +243,7 @@ HKEY hKey = NULL; WCHAR szApplicationName[MAX_PATH]; WCHAR szCommandLine[MAX_PATH + 3]; - DWORD bufferSize = (sizeof(szApplicationName) / sizeof(WCHAR)) - 1; + DWORD bufferSize = sizeof(szApplicationName) - sizeof(WCHAR); DWORD dwType; STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; @@ -280,7 +280,7 @@ if (bufferSize == 0) goto cleanup; - szApplicationName[bufferSize] = 0; /* Terminate the string */ + szApplicationName[bufferSize / sizeof(WCHAR)] = 0; /* Terminate the string */ if (wcslen(szApplicationName) == 0) goto cleanup;

1 0

[arty] 36423: Initialize DbgLoadOptions from the start. It would be unitialized if a bootcd was made without having the right section in txtsetup.sif.
by arty＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: arty Date: Tue Sep 23 04:36:23 2008 New Revision: 36423 URL: http://svn.reactos.org/svn/reactos?rev=36423&view=rev Log: Initialize DbgLoadOptions from the start. It would be unitialized if a bootcd was made without having the right section in txtsetup.sif. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Tue Sep 23 04:36:23 2008 @@ -46,7 +46,7 @@ { ULONG i; LPCSTR SourcePath; - LPCSTR LoadOptions, DbgLoadOptions; + LPCSTR LoadOptions, DbgLoadOptions = ""; LPCSTR sourcePaths[] = { "", /* Only for floppy boot */ #if defined(_M_IX86) @@ -153,8 +153,6 @@ if (!InfGetDataField (&InfContext, 1, &DbgLoadOptions)) DbgLoadOptions = ""; } -#else - DbgLoadOptions = ""; #endif if (!strlen(DbgLoadOptions) && !InfFindFirstLine (InfHandle, "SetupData",

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