Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[hpoussin] 23497: Fix return type in .idl file (advapi32.dll and services.exe already agreed on a error code status as return type)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 6 18:29:19 2006 New Revision: 23497 URL: http://svn.reactos.org/svn/reactos?rev=23497&view=rev Log: Fix return type in .idl file (advapi32.dll and services.exe already agreed on a error code status as return type) Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Sun Aug 6 18:29:19 2006 @@ -1522,7 +1522,7 @@ /* Function 16 */ -unsigned int +unsigned long ScmrOpenServiceW(handle_t BindingHandle, unsigned int hSCManager, wchar_t *lpServiceName, Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl Sun Aug 6 18:29:19 2006 @@ -46,11 +46,11 @@ [in] SC_HANDLE hSCObject); /* Function 1 */ - BOOL ScmrControlService([in] handle_t BindingHandle, - [in] SC_HANDLE hService, - [in] DWORD dwControl, - [out] SERVICE_STATUS *lpServiceStatus); -/* [out] LPSERVICE_STATUS lpServiceStatus); */ + DWORD ScmrControlService([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwControl, + [out] SERVICE_STATUS *lpServiceStatus); +/* [out] LPSERVICE_STATUS lpServiceStatus); */ /* Function 2 */ DWORD ScmrDeleteService([in] handle_t BindingHandle, @@ -165,11 +165,11 @@ [out] SC_HANDLE *hScm); /* Function 16 */ - SC_HANDLE ScmrOpenServiceW([in] handle_t BindingHandle, - [in] SC_HANDLE hSCManager, - [in, string] LPCWSTR lpServiceName, - [in] DWORD dwDesiredAccess, - [out] SC_HANDLE *hScm); + DWORD ScmrOpenServiceW([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string] LPCWSTR lpServiceName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); /* Function 17 */ DWORD ScmrQueryServiceConfigW([in] handle_t BindingHandle,

18 years, 4 months

[hpoussin] 23496: - Add dsgetdc.h header - Add missing constants SECURITY_MIN_SID_SIZE/SECURITY_MAX_SID_SIZE - Define FreeInheritedFromArray only when _WIN32_WINNT >= 0x0501

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 6 16:03:31 2006 New Revision: 23496 URL: http://svn.reactos.org/svn/reactos?rev=23496&view=rev Log: - Add dsgetdc.h header - Add missing constants SECURITY_MIN_SID_SIZE/SECURITY_MAX_SID_SIZE - Define FreeInheritedFromArray only when _WIN32_WINNT >= 0x0501 Added: trunk/reactos/include/psdk/dsgetdc.h (with props) Modified: trunk/reactos/include/psdk/aclapi.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/aclapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/aclapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/aclapi.h (original) +++ trunk/reactos/include/psdk/aclapi.h Sun Aug 6 16:03:31 2006 @@ -27,7 +27,9 @@ VOID WINAPI BuildTrusteeWithObjectsAndSidW(PTRUSTEE_W,POBJECTS_AND_SID,GUID*,GUID*,PSID); VOID WINAPI BuildTrusteeWithSidA(PTRUSTEE_A,PSID); VOID WINAPI BuildTrusteeWithSidW(PTRUSTEE_W,PSID); +#if (_WIN32_WINNT >= 0x0501) DWORD WINAPI FreeInheritedFromArray(PINHERITED_FROMW,USHORT,PFN_OBJECT_MGR_FUNCTS); +#endif DWORD WINAPI GetAuditedPermissionsFromAclA(PACL,PTRUSTEE_A,PACCESS_MASK,PACCESS_MASK); DWORD WINAPI GetAuditedPermissionsFromAclW(PACL,PTRUSTEE_W,PACCESS_MASK,PACCESS_MASK); DWORD WINAPI GetEffectiveRightsFromAclA(PACL,PTRUSTEE_A,PACCESS_MASK); Added: trunk/reactos/include/psdk/dsgetdc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsgetdc.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dsgetdc.h (added) +++ trunk/reactos/include/psdk/dsgetdc.h Sun Aug 6 16:03:31 2006 @@ -1,0 +1,115 @@ +#ifndef _DSGETDC_H +#define _DSGETDC_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define DS_DOMAIN_IN_FOREST 0x01 +#define DS_DOMAIN_DIRECT_OUTBOUND 0x02 +#define DS_DOMAIN_TREE_ROOT 0x04 +#define DS_DOMAIN_PRIMARY 0x08 +#define DS_DOMAIN_NATIVE_MODE 0x10 +#define DS_DOMAIN_DIRECT_INBOUND 0x20 + +typedef struct _DOMAIN_CONTROLLER_INFOA +{ + LPSTR DomainControllerName; + LPSTR DomainControllerAddress; + ULONG DomainControllerAddressType; + GUID DomainGuid; + LPSTR DomainName; + LPSTR DnsForestName; + ULONG Flags; + LPSTR DcSiteName; + LPSTR ClientSiteName; +} DOMAIN_CONTROLLER_INFOA, *PDOMAIN_CONTROLLER_INFOA; + +typedef struct _DOMAIN_CONTROLLER_INFOW +{ + LPWSTR DomainControllerName; + LPWSTR DomainControllerAddress; + ULONG DomainControllerAddressType; + GUID DomainGuid; + LPWSTR DomainName; + LPWSTR DnsForestName; + ULONG Flags; + LPWSTR DcSiteName; + LPWSTR ClientSiteName; +} DOMAIN_CONTROLLER_INFOW, *PDOMAIN_CONTROLLER_INFOW; + +typedef struct _DS_DOMAIN_TRUSTSA +{ + LPSTR NetbiosDomainName; + LPSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSA, *PDS_DOMAIN_TRUSTSA; + +typedef struct _DS_DOMAIN_TRUSTSW +{ + LPWSTR NetbiosDomainName; + LPWSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSW, *PDS_DOMAIN_TRUSTSW; + +DWORD +DsEnumerateDomainTrustsA( + LPSTR ServerName, + ULONG Flags, + PDS_DOMAIN_TRUSTSA* Domains, + PULONG DomainCount); + +DWORD +DsEnumerateDomainTrustsW( + LPWSTR ServerName, + ULONG Flags, + PDS_DOMAIN_TRUSTSW* Domains, + PULONG DomainCount); + +DWORD +DsGetDcNameA( + LPCSTR ComputerName, + LPCSTR DomainName, + GUID* DomainGuid, + LPCSTR SiteName, + ULONG Flags, + PDOMAIN_CONTROLLER_INFOA* DomainControllerInfo); + +DWORD +DsGetDcNameW( + LPCWSTR ComputerName, + LPCWSTR DomainName, + GUID* DomainGuid, + LPCWSTR SiteName, + ULONG Flags, + PDOMAIN_CONTROLLER_INFOW* DomainControllerInfo); + +#ifdef UNICODE +typedef DOMAIN_CONTROLLER_INFOW DOMAIN_CONTROLLER_INFO, *PDOMAIN_CONTROLLER_INFO; +typedef DS_DOMAIN_TRUSTSW DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS; +#define DsEnumerateDomainTrusts DsEnumerateDomainTrustsW +#define DsGetDcName DsGetDcNameW +#else +typedef DOMAIN_CONTROLLER_INFOA DOMAIN_CONTROLLER_INFO, *PDOMAIN_CONTROLLER_INFO; +typedef DS_DOMAIN_TRUSTSA DS_DOMAIN_TRUSTS, *PDS_DOMAIN_TRUSTS; +#define DsEnumerateDomainTrusts DsEnumerateDomainTrustsA +#define DsGetDcName DsGetDcNameA +#endif + +#ifdef __cplusplus +} +#endif +#endif Propchange: trunk/reactos/include/psdk/dsgetdc.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/dsgetdc.h ------------------------------------------------------------------------------ svn:keywords = author date revision Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sun Aug 6 16:03:31 2006 @@ -2334,6 +2334,8 @@ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[ANYSIZE_ARRAY]; } SID, *PISID; +#define SECURITY_MIN_SID_SIZE (sizeof(SID)) +#define SECURITY_MAX_SID_SIZE (FIELD_OFFSET(SID, SubAuthority) + SID_MAX_SUB_AUTHORITIES * sizeof(DWORD)) typedef struct _SID_AND_ATTRIBUTES { PSID Sid; DWORD Attributes;

18 years, 4 months

[greatlrd] 23495: forget remove one line in DirectDraw_GetAvailableVidMem sorry

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Aug 6 14:29:56 2006 New Revision: 23495 URL: http://svn.reactos.org/svn/reactos?rev=23495&view=rev Log: forget remove one line in DirectDraw_GetAvailableVidMem sorry Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Aug 6 14:29:56 2006 @@ -1326,11 +1326,9 @@ { return DDERR_NODRIVERSUPPORT; } - - mem.lpDD = &This->mDDrawGlobal; - mem.ddRVal = DDERR_NOTPALETTIZED; - + mem.lpDD = This->mDDrawLocal.lpGbl; + mem.ddRVal = DDERR_NOTPALETTIZED; mem.DDSCaps.dwCaps = ddscaps->dwCaps; mem.ddsCapsEx.dwCaps2 = ddscaps->dwCaps2; mem.ddsCapsEx.dwCaps3 = ddscaps->dwCaps3;

18 years, 4 months

[greatlrd] 23494: fixing some bugs in DirectDraw_GetAvailableVidMem

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Aug 6 14:28:08 2006 New Revision: 23494 URL: http://svn.reactos.org/svn/reactos?rev=23494&view=rev Log: fixing some bugs in DirectDraw_GetAvailableVidMem Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Aug 6 14:28:08 2006 @@ -1330,15 +1330,20 @@ mem.lpDD = &This->mDDrawGlobal; mem.ddRVal = DDERR_NOTPALETTIZED; + mem.lpDD = This->mDDrawLocal.lpGbl; + mem.DDSCaps.dwCaps = ddscaps->dwCaps; + mem.ddsCapsEx.dwCaps2 = ddscaps->dwCaps2; + mem.ddsCapsEx.dwCaps3 = ddscaps->dwCaps3; + mem.ddsCapsEx.dwCaps4 = ddscaps->dwCaps4; + if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory(&mem) == DDHAL_DRIVER_HANDLED); { - ddscaps->dwCaps = mem.DDSCaps.dwCaps; - ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; - ddscaps->dwCaps3 = mem.ddsCapsEx.dwCaps3; - ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; - *total = mem.dwTotal; + if (total !=NULL) + { + *total = mem.dwTotal; + } + *free = mem.dwFree; - return mem.ddRVal; }

18 years, 4 months

[greatlrd] 23493: Bugfix DirectDraw_AddRef

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Aug 6 13:56:21 2006 New Revision: 23493 URL: http://svn.reactos.org/svn/reactos?rev=23493&view=rev Log: Bugfix DirectDraw_AddRef Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Aug 6 13:56:21 2006 @@ -61,13 +61,18 @@ DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref=0; - + if (iface!=NULL) { - ref = InterlockedIncrement( (PLONG) &This->mDDrawLocal.dwLocalRefCnt); + This->mDDrawLocal.dwLocalRefCnt++; + This->Ref++; + + if (This->mDDrawLocal.lpGbl != NULL) + { + This->mDDrawLocal.lpGbl->dwRefCnt++; + } } - return ref; + return This->Ref; } /* @@ -81,13 +86,18 @@ DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref=0; - + if (iface!=NULL) { - ref = InterlockedDecrement( (PLONG) &This->mDDrawLocal.dwLocalRefCnt); + This->mDDrawLocal.dwLocalRefCnt--; + This->Ref--; + + if (This->mDDrawLocal.lpGbl != NULL) + { + This->mDDrawLocal.lpGbl->dwRefCnt--; + } - if (ref == 0) + if ( This->Ref == 0) { // set resoltion back to the one in registry if(This->cooperative_level & DDSCL_EXCLUSIVE) @@ -102,7 +112,7 @@ } } } - return ref; + return This->Ref; } /* Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Aug 6 13:56:21 2006 @@ -49,6 +49,8 @@ IDirectDraw4Vtbl* lpVtbl_v4; IDirectDraw2Vtbl* lpVtbl_v2; IDirectDrawVtbl* lpVtbl_v1; + + ULONG Ref; /* The main struct that contain all info from the HAL and HEL */ HDC hdc; Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Aug 6 13:56:21 2006 @@ -212,7 +212,8 @@ /* Setup calback struct so we do not need refill same info again */ This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - + + This->mDDrawLocal.lpGbl = &This->mDDrawGlobal; return DD_OK; }

18 years, 4 months

[greatlrd] 23492: fixing ddraw regress instead bsod or fail create surface, now it fail on attach surface

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Aug 6 12:47:18 2006 New Revision: 23492 URL: http://svn.reactos.org/svn/reactos?rev=23492&view=rev Log: fixing ddraw regress instead bsod or fail create surface, now it fail on attach surface Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Aug 6 12:47:18 2006 @@ -250,9 +250,8 @@ if (This->mDdCreatePalette.CreatePalette(&This->mDdCreatePalette) == DDHAL_DRIVER_HANDLED); { - if (This->mDdCreatePalette.ddRVal == DD_OK) + if (This->mDdSetMode.ddRVal == DD_OK) { - Main_DirectDraw_AddRef(iface); return That->lpVtbl->Initialize (*ppPalette, (LPDIRECTDRAW)iface, dwFlags, palent); } @@ -261,6 +260,7 @@ return DDERR_NODRIVERSUPPORT; } +HRESULT internal_CreateNewSurface(IDirectDrawImpl* This, IDirectDrawSurfaceImpl* That); /* * stub * Status not done @@ -271,53 +271,260 @@ DX_WINDBG_trace(); DxSurf *surf; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawSurfaceImpl* That; + DEVMODE DevMode; + LONG extra_surfaces = 0; if (pUnkOuter!=NULL) - return DDERR_INVALIDPARAMS; + { + return CLASS_E_NOAGGREGATION; + } if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) + { return DDERR_UNSUPPORTED; - - // the nasty com stuff - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - IDirectDrawSurfaceImpl* That; - - That = (IDirectDrawSurfaceImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawSurfaceImpl)); + } + + That = (IDirectDrawSurfaceImpl*)DxHeapMemAlloc(sizeof(IDirectDrawSurfaceImpl)); if (That == NULL) { return E_OUTOFMEMORY; } - ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); - - surf = (DxSurf*)HeapAlloc(GetProcessHeap(), 0, sizeof(DxSurf)); + + surf = (DxSurf*)DxHeapMemAlloc(sizeof(DxSurf)); if (surf == NULL) { - // FIXME Free memmory at exit + DxHeapMemFree(That); return E_OUTOFMEMORY; } - ZeroMemory(surf, sizeof(DxSurf)); - - - + That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; *ppSurf = (LPDIRECTDRAWSURFACE7)That; - - That->Owner = (IDirectDrawImpl *)This; + // FIXME free This->mDDrawGlobal.dsList on release + if (This->mDDrawGlobal.dsList == NULL) + { + This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); + if (This->mDDrawGlobal.dsList == NULL) + { + DxHeapMemFree(surf); + DxHeapMemFree(That); + return E_OUTOFMEMORY; + } + + That->Owner = (IDirectDrawImpl *)This; + That->Owner->mDDrawGlobal.dsList->dwIntRefCnt =1; + + /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ + That->Owner->mDDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; + } + + That->Surf = surf; + + /* Code from wine cvs 24/7-2006 */ + + if (!(pDDSD->dwFlags & DDSD_CAPS)) + { + /* DVIDEO.DLL does forget the DDSD_CAPS flag ... *sigh* */ + pDDSD->dwFlags |= DDSD_CAPS; + } + if (pDDSD->ddsCaps.dwCaps == 0) + { + /* This has been checked on real Windows */ + pDDSD->ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; + } + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) + { + /* If the surface is of the 'alloconload' type, ignore the LPSURFACE field */ + pDDSD->dwFlags &= ~DDSD_LPSURFACE; + } + + if ((pDDSD->dwFlags & DDSD_LPSURFACE) && (pDDSD->lpSurface == NULL)) + { + /* Frank Herbert's Dune specifies a null pointer for the surface, ignore the LPSURFACE field */ + pDDSD->dwFlags &= ~DDSD_LPSURFACE; + } + + + /* continue with my own code */ + memcpy(&That->Surf->mddsdPrimary,pDDSD,pDDSD->dwSize); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC2); + + memset(&DevMode,0,sizeof(DEVMODE)); + DevMode.dmSize = (WORD)sizeof(DEVMODE); + DevMode.dmDriverExtra = 0; + + EnumDisplaySettingsEx(NULL, ENUM_CURRENT_SETTINGS, &DevMode, 0); + if(!(pDDSD->dwFlags & DDSD_PIXELFORMAT)) + { + That->Surf->mddsdPrimary.dwFlags |= DDSD_PIXELFORMAT; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); + + if(pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + /* FIXME */ + DX_STUB_str("DDSCAPS_ZBUFFER not implement"); + switch(pDDSD->dwMipMapCount) + { + case 15: + break; + case 16: + break; + case 24: + break; + case 32: + break; + default: + DX_STUB_str("nknown Z buffer bit depth"); + } + } + else + { + switch(DevMode.dmBitsPerPel) + { + case 8: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=8; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0; /* Blue bitmask */ + break; + + case 15: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=15; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0x7C00; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0x3E0; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ + break; + + case 16: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=16; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0xF800; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0x7E0; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ + break; + + case 24: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=24; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ + break; + + case 32: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=8; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ + break; + + default: + break; + } + } /* end else */ + } /* end if(!(pDDSD->dwFlags & DDSD_PIXELFORMAT)) */ + + /* Code from wine cvs 24/7-2006 */ + if(!(pDDSD->dwFlags & DDSD_WIDTH) || !(pDDSD->dwFlags & DDSD_HEIGHT) ) + { + HWND window = (HWND) This->mDDrawGlobal.lpExclusiveOwner->hWnd; + + /* Fallback: From WineD3D / original mode */ + That->Surf->mddsdPrimary.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + + That->Surf->mddsdPrimary.dwWidth =DevMode.dmPelsWidth; + That->Surf->mddsdPrimary.dwHeight = DevMode.dmPelsHeight; + + if( (window != 0) ) + { + RECT rect; + if(GetWindowRect(window, &rect) ) + { + /* This is a hack until I find a better solution */ + if( (rect.right - rect.left) <= 1 || + (rect.bottom - rect.top) <= 1 ) + { + /* + FIXME("Wanted to get surface dimensions from window %p, but it has only \ + a size of %ldx%ld. Using full screen dimensions\n", + window, rect.right - rect.left, rect.bottom - rect.top); + */ + } + else + { + /* Not sure if this is correct */ + That->Surf->mddsdPrimary.dwWidth = rect.right - rect.left; + That->Surf->mddsdPrimary.dwHeight = rect.bottom - rect.top; + /* TRACE("Using window %p's dimensions: %ldx%ld\n", window, desc2.dwWidth, desc2.dwHeight); */ + } + } + } + } + + /* Mipmap count fixes */ + if(That->Surf->mddsdPrimary.ddsCaps.dwCaps & DDSCAPS_MIPMAP) + { + if(That->Surf->mddsdPrimary.ddsCaps.dwCaps & DDSCAPS_COMPLEX) + { + if(!That->Surf->mddsdPrimary.dwFlags & DDSD_MIPMAPCOUNT) + { + /* Undocumented feature: Create sublevels until + * either the width or the height is 1 + */ + DWORD min = That->Surf->mddsdPrimary.dwWidth < That->Surf->mddsdPrimary.dwHeight ? + That->Surf->mddsdPrimary.dwWidth : That->Surf->mddsdPrimary.dwHeight; + + That->Surf->mddsdPrimary.dwMipMapCount = 0; + while( min ) + { + That->Surf->mddsdPrimary.dwMipMapCount += 1; + min >>= 1; + } + } + } + else + { + That->Surf->mddsdPrimary.dwMipMapCount = 1; + } + extra_surfaces = That->Surf->mddsdPrimary.dwMipMapCount - 1; + That->Surf->mddsdPrimary.dwFlags |= DDSD_MIPMAPCOUNT; + } + + if( (That->Surf->mddsdPrimary.dwFlags & DDSD_CAPS) && + (That->Surf->mddsdPrimary.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ) + { + That->Surf->mddsdPrimary.ddsCaps.dwCaps |= DDSCAPS_FRONTBUFFER; + } + - /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ - That->Owner->mDDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; - - - That->Surf = surf; - - // UINT i; - //IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - //IDirectDrawSurfaceImpl* That = ppSurf; + + + + @@ -325,118 +532,14 @@ if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - memcpy(&That->Surf->mddsdPrimary,pDDSD,pDDSD->dwSize); - That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC2); - This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; - - if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (This->mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - memset(&That->Owner->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - That->Owner->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - That->Owner->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - That->Owner->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - That->Owner->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - That->Owner->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - That->Owner->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; - - memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Surf->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; - That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; - That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); - - /* - FIXME Check the flags if we shall create a primaresurface for overlay or something else - Examine windows which flags are being set for we assume this is right unsue I think - */ - //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; - That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; - - - - This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; - This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; - This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; - - - if (This->mDdCreateSurface.CreateSurface(&This->mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (This->mDdCreateSurface.ddRVal != DD_OK) - { - return This->mDdCreateSurface.ddRVal; - } - - - /* FIXME fill in this if they are avali - DDSD_BACKBUFFERCOUNT - DDSD_CKDESTBLT - DDSD_CKDESTOVERLAY - DDSD_CKSRCBLT - DDSD_CKSRCOVERLAY - DDSD_LINEARSIZE - DDSD_LPSURFACE - DDSD_MIPMAPCOUNT - DDSD_ZBUFFERBITDEPTH - */ - - That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; - RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); - //RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); - - //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); - //RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); - - if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; - That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; - } - - if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; - That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; - } - - if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; - That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; - } - - if ( This->mDDrawGlobal.dwMonitorFrequency != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; - That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - } - - if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; - That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; - } - - That->Surf->mpInUseSurfaceLocals[0] = &That->Surf->mPrimaryLocal; - return DD_OK; - - } + + return internal_CreateNewSurface( This, That); + + } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) - { + { + return internal_CreateNewSurface( This, That); + memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); memcpy(&That->Surf->mddsdOverlay, pDDSD, sizeof(DDSURFACEDESC)); That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); @@ -567,6 +670,60 @@ } +HRESULT +internal_CreateNewSurface(IDirectDrawImpl* This, IDirectDrawSurfaceImpl* That) +{ + This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; + + if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (This->mDdCanCreateSurface.ddRVal != DD_OK) + { + return DDERR_NOTINITIALIZED; + } + + memset(&That->Owner->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + That->Owner->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + That->Owner->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + That->Owner->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + That->Owner->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + That->Owner->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + That->Owner->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; + + memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Surf->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; + That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; + That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + + That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; + That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; + + This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; + This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; + This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; + + + if (This->mDdCreateSurface.CreateSurface(&This->mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (This->mDdCreateSurface.ddRVal != DD_OK) + { + return This->mDdCreateSurface.ddRVal; + } + + That->Surf->mpInUseSurfaceLocals[0] = &That->Surf->mPrimaryLocal; + return DD_OK; +} + /* * stub * Status not done @@ -605,6 +762,10 @@ /* FIXME check if the mode are suppretd before sending it back */ + + memset(&DevMode,0,sizeof(DEVMODE)); + DevMode.dmSize = (WORD)sizeof(DEVMODE); + DevMode.dmDriverExtra = 0; while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0)) { @@ -1047,7 +1208,7 @@ DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - //BOOL dummy = TRUE; + BOOL dummy = TRUE; DEVMODE DevMode; int iMode=0; int Width=0; @@ -1099,17 +1260,9 @@ This->mDdSetMode.ddRVal = DDERR_NOTPALETTIZED; This->mDdSetMode.dwModeIndex = iMode; + This->mDdSetMode.SetMode(&This->mDdSetMode); - if (This->mDdSetMode.SetMode(&This->mDdSetMode) == DDHAL_DRIVER_HANDLED) - { - if (This->mDdSetMode.ddRVal == DD_OK) - ; - //DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); - //} - } - - - + DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); /* FIXME fill the This->DirectDrawGlobal.vmiData right */ //This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC( (HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd); Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Aug 6 12:47:18 2006 @@ -212,19 +212,6 @@ /* Setup calback struct so we do not need refill same info again */ This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - - - /* Setup global surface */ - // FIXME free dsList when we exist - This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); - This->mDDrawGlobal.dsList->dwIntRefCnt =1; - - This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; return DD_OK; } @@ -377,7 +364,13 @@ DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); This->mHALInfo.GetDriverInfo(&DriverInfo); - + /* Setup global surface */ + /*This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch;*/ /* FIXME free it in cleanup */ // This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT));

18 years, 4 months

[fireball] 23491: [AUDIT] Configuration Manager Cm part of the kernel was developed from scratch for a long time ago, and based only on legally clean information sources. After going through the code, it doesn't have any signs of questionable origin. Authorship information will be added during formatting of the code.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 6 01:39:29 2006 New Revision: 23491 URL: http://svn.reactos.org/svn/reactos?rev=23491&view=rev Log: [AUDIT] Configuration Manager Cm part of the kernel was developed from scratch for a long time ago, and based only on legally clean information sources. After going through the code, it doesn't have any signs of questionable origin. Authorship information will be added during formatting of the code. Modified: trunk/reactos/ntoskrnl/cm/cm.h (props changed) trunk/reactos/ntoskrnl/cm/import.c (props changed) trunk/reactos/ntoskrnl/cm/ntfunc.c (props changed) trunk/reactos/ntoskrnl/cm/regfile.c (props changed) trunk/reactos/ntoskrnl/cm/registry.c (props changed) trunk/reactos/ntoskrnl/cm/regobj.c (props changed) Propchange: trunk/reactos/ntoskrnl/cm/cm.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/import.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/ntfunc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/regfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/registry.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/regobj.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 4 months

[fireball] 23490: Fix the last definition of DbgPrint

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 6 01:17:55 2006 New Revision: 23490 URL: http://svn.reactos.org/svn/reactos?rev=23490&view=rev Log: Fix the last definition of DbgPrint Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/framebased.h (original) +++ trunk/reactos/include/reactos/libs/pseh/framebased.h Sun Aug 6 01:17:55 2006 @@ -45,7 +45,7 @@ # define _SEHSetJmp setjmp # define _SEHJmpBuf_t jmp_buf #endif -unsigned long DbgPrint(const char * Format,...); +unsigned long DbgPrint(PCCHAR Format,...); typedef struct __SEHFrame { _SEHPortableFrame_t SEH_Header;

18 years, 4 months

[fireball] 23489: Fix DbgPrint / DbgPrintEx definitions to use PCCHAR instead of PCCH (recent WDK uses PCCHAR). This change fixes compiling.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 6 00:57:36 2006 New Revision: 23489 URL: http://svn.reactos.org/svn/reactos?rev=23489&view=rev Log: Fix DbgPrint / DbgPrintEx definitions to use PCCHAR instead of PCCH (recent WDK uses PCCHAR). This change fixes compiling. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sun Aug 6 00:57:36 2006 @@ -10450,7 +10450,7 @@ ULONG __cdecl DbgPrint( - IN PCCH Format, + IN PCCHAR Format, IN ...); ULONG @@ -10458,7 +10458,7 @@ DbgPrintEx( IN ULONG ComponentId, IN ULONG Level, - IN PCCH Format, + IN PCCHAR Format, IN ...); NTOSAPI Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Sun Aug 6 00:57:36 2006 @@ -2454,7 +2454,7 @@ ULONG __cdecl DbgPrint( - IN PCCH Format, + IN PCCHAR Format, IN ... ); @@ -2464,7 +2464,7 @@ DbgPrintEx( IN ULONG ComponentId, IN ULONG Level, - IN PCCH Format, + IN PCCHAR Format, IN ... ); Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h (original) +++ trunk/reactos/include/reactos/debug.h Sun Aug 6 00:57:36 2006 @@ -29,7 +29,7 @@ ULONG __cdecl DbgPrint( - IN PCCH Format, + IN PCCHAR Format, IN ... );

18 years, 4 months

[ion] 23488: - Fix another incorrect DbgPrint prototype.

by ion＠svn.reactos.org

Author: ion Date: Sat Aug 5 20:50:36 2006 New Revision: 23488 URL: http://svn.reactos.org/svn/reactos?rev=23488&view=rev Log: - Fix another incorrect DbgPrint prototype. Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h (original) +++ trunk/reactos/include/reactos/debug.h Sat Aug 5 20:50:36 2006 @@ -29,7 +29,7 @@ ULONG __cdecl DbgPrint( - IN PCH Format, + IN PCCH Format, IN ... );

18 years, 4 months

← Newer
1
...
33
34
35
36
37
38
39
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2006