Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[sgasiorek] 74137: [WIN32SS] Allocate memory for EDD_DIRECTDRAW_GLOBAL while creating PDEV (partially fixes CORE-7733) [SDK] Update EDD_DIRECTDRAW_GLOBAL structure

by sgasiorek＠svn.reactos.org

Author: sgasiorek Date: Thu Mar 9 21:03:47 2017 New Revision: 74137 URL: http://svn.reactos.org/svn/reactos?rev=74137&view=rev Log: [WIN32SS] Allocate memory for EDD_DIRECTDRAW_GLOBAL while creating PDEV (partially fixes CORE-7733) [SDK] Update EDD_DIRECTDRAW_GLOBAL structure Modified: trunk/reactos/sdk/include/reactos/drivers/directx/directxint.h trunk/reactos/win32ss/gdi/eng/pdevobj.c trunk/reactos/win32ss/reactx/dxg/dxg_int.h trunk/reactos/win32ss/reactx/ntddraw/ddraw.c Modified: trunk/reactos/sdk/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/directx/directxint.h [iso-8859-1] Thu Mar 9 21:03:47 2017 @@ -102,9 +102,16 @@ * if any of these flags are set in dwCallbackFlags (struct EDD_DIRECTDRAW_GLOBAL), * it means that the respective callback member for it has been filled in by a graphic driver */ -#define EDDDGBL_MISCCALLBACKS 0x01 // ddMiscellanousCallbacks -#define EDDDGBL_VIDEOPORTCALLBACKS 0x02 // ddVideoPortCallback -#define EDDDGBL_MISC2CALLBACKS 0x80 // ddMiscellanous2Callbacks +#define EDDDGBL_MISCCALLBACKS 0x001 // ddMiscellanousCallbacks +#define EDDDGBL_VIDEOPORTCALLBACKS 0x002 // ddVideoPortCallback +#define EDDDGBL_COLORCONTROLCALLBACKS 0x004 // ddColorControlCallbacks +#define EDDDGBL_MOTIONCOMPCALLBACKS 0x040 // ddMotionCompCallbacks +#define EDDDGBL_MISC2CALLBACKS 0x080 // ddMiscellanous2Callbacks +#define EDDDGBL_DDMORECAPS 0x100 // ddMorecaps +#define EDDDGBL_D3DCALLBACKS3 0x200 // d3dNtHalCallbacks3 +#define EDDDGBL_NTCALLBACKS 0x400 // ddNtCallbacks +#define EDDDGBL_PRIVATEDRIVERCAPS 0x800 // ddNtPrivateDriverCaps + typedef struct _EDD_DIRECTDRAW_GLOBAL { @@ -140,34 +147,40 @@ /* 0x038 */ DWORD dwNumFourCC; // 0x038 <-- verified to match Windows XP, dwNumFourCC /* 0x03C */ PDWORD pdwFourCC; // 0x03C <-- verified to match Windows XP, pdwFourCC /* 0x040 */ DD_HALINFO ddHalInfo; // 0x040 <-- verified to match Windows XP, ddHalInfo -/* 0x1E0 */ ULONG unk_1e0[46]; +/* 0x1E0 */ ULONG unk_1e0[17]; // DxApi interface (size 0x44) +/* 0x224 */ ULONG unk_224; // +/* 0x228 */ ULONG unk_228[14]; // AGP interface (size 0x38) +/* 0x260 */ DDKERNELCAPS ddKernelCaps; // 0x260 <-- verified to match Windows Server 2003 +/* 0x26C */ DD_MORECAPS ddMoreCaps; // 0x26C <-- verified to match Windows Server 2003 +/* 0x290 */ DD_NTPRIVATEDRIVERCAPS ddNtPrivateDriverCaps; // 0x290 <-- verified to match Windows Server 2003 /* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks /* 0x2C4 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks /* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x304 <-- verified to match Windows XP, ddPaletteCallbacks -/* 0x314 */ ULONG unk_314[46]; +/* 0x314 */ D3DNTHAL_GLOBALDRIVERDATA d3dNtGlobalDriverData; /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; -/* 0x460 */ ULONG unk_460[9]; +/* 0x460 */ DD_D3DBUFCALLBACKS d3dBufCallbacks; /* 0x47C */ D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; /* 0x498 */ DD_VIDEOPORTCALLBACKS ddVideoPortCallback; // 0x498 <-- verified to match Windows XP, ddVideoPortCallback /* 0x4E0 */ DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; // 0x4E0 <-- verified to match Windows XP, ddMiscellanousCallbacks /* 0x4EC */ DD_MISCELLANEOUS2CALLBACKS ddMiscellanous2Callbacks; // 0x4EC <-- verified to match Windows XP, ddMiscellanous2Callbacks -/* 0x504 */ ULONG unk_504[10]; -/* 0x534 */ D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; -/* 0x5A4 */ ULONG unk_544; -/* 0x5A8 */ ULONG unk_548; -/* 0x54C */ ULONG unk_54c[23]; +/* 0x504 */ DD_NTCALLBACKS ddNtCallbacks; // 0x504 <-- verified to match Windows Server 2003 +/* 0x518 */ DD_COLORCONTROLCALLBACKS ddColorControlCallbacks; // 0x518 <-- verified to match Windows Server 2003 +/* 0x524 */ DD_KERNELCALLBACKS ddKernelCallbacks; // 0x524 <-- verified to match Windows Server 2003 +/* 0x534 */ D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; // 0x524 <-- verified to match Windows Server 2003 +/* 0x54C */ DD_MOTIONCOMPCALLBACKS ddMotionCompCallbacks; // 0x54C <-- verified to match Windows Server 2003 +/* 0x57C */ DDMORESURFACECAPS ddMoreSurfaceCaps; // 0x57C <-- verified to match Windows Server 2003 /* 0x5A8 */ EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; // 0x5A8 <-- verified to match Windows XP, it is a current local struct, not a list, peDirectDrawLocalList Current -/* 0x5ac */ EDD_SURFACE* peSurface_LockList; +/* 0x5AC */ EDD_SURFACE* peSurface_LockList; /* 0x5B0 */ FLONG fl; /* 0x5B4 */ ULONG cSurfaceLocks; /* 0x5B8 */ PKEVENT pAssertModeEvent; -/* 0x5Bc */ EDD_SURFACE *peSurfaceCurrent; +/* 0x5BC */ EDD_SURFACE *peSurfaceCurrent; /* 0x5C0 */ EDD_SURFACE *peSurfacePrimary; /* 0x5C4 */ BOOL bSuspended; // 0x5C4 <-- verified to match Windows XP, tells dxg to use driver's own api or return error code instead /* 0x5C8 */ ULONG unk_5c8[12]; /* 0x5F8 */ RECTL rcbounds; /* 0x608 */ ULONG unk_608; -/* 0x60c */ HDEV hDev; // 0x60c <-- verified to match Windows XP, The real Pdev, hDev +/* 0x60C */ HDEV hDev; // 0x60c <-- verified to match Windows XP, The real Pdev, hDev /* Windows XP and higher */ /* 0x610 */ ULONG unk_610[63]; Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Thu Mar 9 21:03:47 2017 @@ -67,6 +67,11 @@ return NULL; } + /* Allocate EDD_DIRECTDRAW_GLOBAL for our ReactX driver */ + ppdev->pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), GDITAG_PDEV); + if (ppdev->pEDDgpl) + RtlZeroMemory(ppdev->pEDDgpl, sizeof(EDD_DIRECTDRAW_GLOBAL)); + ppdev->cPdevRefs = 1; return ppdev; @@ -78,6 +83,8 @@ PPDEVOBJ ppdev) { EngDeleteSemaphore(ppdev->hsemDevLock); + if (ppdev->pEDDgpl) + ExFreePoolWithTag(ppdev->pEDDgpl, GDITAG_PDEV); ExFreePoolWithTag(ppdev, GDITAG_PDEV); } Modified: trunk/reactos/win32ss/reactx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/dxg_int… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/dxg_int.h [iso-8859-1] Thu Mar 9 21:03:47 2017 @@ -14,6 +14,8 @@ #include <winerror.h> #include <wingdi.h> #include <winddi.h> +#include <ddkernel.h> +#include <ddrawi.h> /* DXG treats this as opaque */ typedef PVOID PDC; Modified: trunk/reactos/win32ss/reactx/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/ddr… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/ddraw.c [iso-8859-1] Thu Mar 9 21:03:47 2017 @@ -714,55 +714,6 @@ DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.ddCaps.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.ddCaps.dwSize),pEddgbl->ddHalInfo.ddCaps.dwSize); DPRINT1("0x%08lx 0x08C PEDD_DIRECTDRAW_GLOBAL->ddHalInfo.ddCaps.dwCaps : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddHalInfo.ddCaps.dwCaps),pEddgbl->ddHalInfo.ddCaps.dwCaps); - - - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[0]),pEddgbl->unk_1e0[0]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[1]),pEddgbl->unk_1e0[1]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[2] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[2]),pEddgbl->unk_1e0[2]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[3] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[3]),pEddgbl->unk_1e0[3]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[4] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[4]),pEddgbl->unk_1e0[4]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[5] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[5]),pEddgbl->unk_1e0[5]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[6] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[6]),pEddgbl->unk_1e0[6]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[7] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[7]),pEddgbl->unk_1e0[7]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[8] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[8]),pEddgbl->unk_1e0[8]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[9] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[9]),pEddgbl->unk_1e0[9]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[10] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[10]),pEddgbl->unk_1e0[10]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[11] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[11]),pEddgbl->unk_1e0[11]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[12] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[12]),pEddgbl->unk_1e0[12]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[13] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[13]),pEddgbl->unk_1e0[13]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[14] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[14]),pEddgbl->unk_1e0[14]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[15] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[15]),pEddgbl->unk_1e0[15]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[16] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[16]),pEddgbl->unk_1e0[16]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[17] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[17]),pEddgbl->unk_1e0[17]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[18] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[18]),pEddgbl->unk_1e0[18]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[19] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[19]),pEddgbl->unk_1e0[19]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[20] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[20]),pEddgbl->unk_1e0[20]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[21] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[21]),pEddgbl->unk_1e0[21]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[22] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[22]),pEddgbl->unk_1e0[22]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[23] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[23]),pEddgbl->unk_1e0[23]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[24] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[24]),pEddgbl->unk_1e0[24]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[25] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[25]),pEddgbl->unk_1e0[25]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[26] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[26]),pEddgbl->unk_1e0[26]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[27] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[27]),pEddgbl->unk_1e0[27]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[28] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[28]),pEddgbl->unk_1e0[28]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[29] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[29]),pEddgbl->unk_1e0[29]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[30] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[30]),pEddgbl->unk_1e0[30]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[31] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[31]),pEddgbl->unk_1e0[31]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[32] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[32]),pEddgbl->unk_1e0[32]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[33] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[33]),pEddgbl->unk_1e0[33]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[34] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[34]),pEddgbl->unk_1e0[34]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[35] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[35]),pEddgbl->unk_1e0[35]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[36] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[36]),pEddgbl->unk_1e0[36]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[37] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[37]),pEddgbl->unk_1e0[37]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[38] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[38]),pEddgbl->unk_1e0[38]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[39] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[39]),pEddgbl->unk_1e0[39]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[40] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[40]),pEddgbl->unk_1e0[0]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[41] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[41]),pEddgbl->unk_1e0[41]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[42] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[42]),pEddgbl->unk_1e0[42]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[43] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[43]),pEddgbl->unk_1e0[43]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[44] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[44]),pEddgbl->unk_1e0[44]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_1e0[45] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_1e0[45]),pEddgbl->unk_1e0[45]); - DPRINT1("0x%08lx 0x298 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.dwSize),pEddgbl->ddCallbacks.dwSize); DPRINT1("0x%08lx 0x29C PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.dwFlags),pEddgbl->ddCallbacks.dwFlags); DPRINT1("0x%08lx 0x2A0 PEDD_DIRECTDRAW_GLOBAL->ddCallbacks.DestroyDriver : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddCallbacks.DestroyDriver),pEddgbl->ddCallbacks.DestroyDriver); @@ -797,66 +748,11 @@ DPRINT1("0x%08lx 0x308 PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.DestroyPalette : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.DestroyPalette),pEddgbl->ddPaletteCallbacks.DestroyPalette); DPRINT1("0x%08lx 0x30C PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.SetEntries : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddPaletteCallbacks.SetEntries),pEddgbl->ddPaletteCallbacks.SetEntries); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[0]),pEddgbl->unk_314[0]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[1]),pEddgbl->unk_314[1]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[2] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[2]),pEddgbl->unk_314[2]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[3] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[3]),pEddgbl->unk_314[3]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[4] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[4]),pEddgbl->unk_314[4]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[5] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[5]),pEddgbl->unk_314[5]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[6] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[6]),pEddgbl->unk_314[6]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[7] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[7]),pEddgbl->unk_314[7]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[8] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[8]),pEddgbl->unk_314[8]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[9] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[9]),pEddgbl->unk_314[9]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[10] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[10]),pEddgbl->unk_314[10]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[11] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[11]),pEddgbl->unk_314[11]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[12] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[12]),pEddgbl->unk_314[12]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[13] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[13]),pEddgbl->unk_314[13]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[14] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[14]),pEddgbl->unk_314[14]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[15] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[15]),pEddgbl->unk_314[15]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[16] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[16]),pEddgbl->unk_314[16]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[17] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[17]),pEddgbl->unk_314[17]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[18] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[18]),pEddgbl->unk_314[18]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[19] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[19]),pEddgbl->unk_314[19]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[20] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[20]),pEddgbl->unk_314[20]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[21] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[21]),pEddgbl->unk_314[21]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[22] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[22]),pEddgbl->unk_314[22]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[23] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[23]),pEddgbl->unk_314[23]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[24] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[24]),pEddgbl->unk_314[24]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[25] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[25]),pEddgbl->unk_314[25]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[26] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[26]),pEddgbl->unk_314[26]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[27] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[27]),pEddgbl->unk_314[27]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[28] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[28]),pEddgbl->unk_314[28]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[29] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[29]),pEddgbl->unk_314[29]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[30] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[30]),pEddgbl->unk_314[30]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[31] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[31]),pEddgbl->unk_314[31]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[32] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[32]),pEddgbl->unk_314[32]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[33] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[33]),pEddgbl->unk_314[33]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[34] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[34]),pEddgbl->unk_314[34]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[35] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[35]),pEddgbl->unk_314[35]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[36] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[36]),pEddgbl->unk_314[36]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[37] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[37]),pEddgbl->unk_314[37]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[38] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[38]),pEddgbl->unk_314[38]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[39] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[39]),pEddgbl->unk_314[39]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[40] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[40]),pEddgbl->unk_314[40]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[41] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[41]),pEddgbl->unk_314[41]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[42] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[42]),pEddgbl->unk_314[42]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[43] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[43]),pEddgbl->unk_314[43]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[44] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[44]),pEddgbl->unk_314[44]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_314[45] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_314[45]),pEddgbl->unk_314[45]); - // D3DNTHAL_CALLBACKS d3dNtHalCallbacks; - //DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks),pEddgbl->d3dNtHalCallbacks); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[0]),pEddgbl->unk_460[0]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[1]),pEddgbl->unk_460[1]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[2] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[2]),pEddgbl->unk_460[2]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[3] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[3]),pEddgbl->unk_460[3]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[4] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[4]),pEddgbl->unk_460[4]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[5] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[5]),pEddgbl->unk_460[5]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[6] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[6]),pEddgbl->unk_460[6]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[7] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[7]),pEddgbl->unk_460[7]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[8] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_460[8]),pEddgbl->unk_460[8]); - // D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; - //DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks2 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks2),pEddgbl->d3dNtHalCallbacks2); - + DPRINT1("0x%08lx 0x314 PEDD_DIRECTDRAW_GLOBAL->d3dNtGlobalDriverData.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtGlobalDriverData.dwSize),pEddgbl->d3dNtGlobalDriverData.dwSize); + DPRINT1("0x%08lx 0x3D4 PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks.dwSize),pEddgbl->d3dNtHalCallbacks.dwSize); + DPRINT1("0x%08lx 0x460 PEDD_DIRECTDRAW_GLOBAL->d3dBufCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dBufCallbacks.dwSize),pEddgbl->d3dBufCallbacks.dwSize); + DPRINT1("0x%08lx 0x47C PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks2.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks2.dwSize),pEddgbl->d3dNtHalCallbacks2.dwSize); + DPRINT1("0x%08lx 0x498 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.dwSize),pEddgbl->ddVideoPortCallback.dwSize); DPRINT1("0x%08lx 0x49C PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.dwFlags),pEddgbl->ddVideoPortCallback.dwFlags); DPRINT1("0x%08lx 0x4A0 PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.CanCreateVideoPort : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddVideoPortCallback.CanCreateVideoPort),pEddgbl->ddVideoPortCallback.CanCreateVideoPort); @@ -887,44 +783,26 @@ DPRINT1("0x%08lx 0x4FC PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.GetDriverState : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.GetDriverState),pEddgbl->ddMiscellanous2Callbacks.GetDriverState); DPRINT1("0x%08lx 0x500 PEDD_DIRECTDRAW_GLOBAL->ddMiscellanous2Callbacks.DestroyDDLocal : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMiscellanous2Callbacks.DestroyDDLocal),pEddgbl->ddMiscellanous2Callbacks.DestroyDDLocal); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[0]),pEddgbl->unk_504[0]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[1]),pEddgbl->unk_504[1]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[2] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[2]),pEddgbl->unk_504[2]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[3] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[3]),pEddgbl->unk_504[3]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[4] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[4]),pEddgbl->unk_504[4]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[5] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[5]),pEddgbl->unk_504[5]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[6] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[6]),pEddgbl->unk_504[6]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[7] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[7]),pEddgbl->unk_504[7]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[8] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[8]),pEddgbl->unk_504[8]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[9] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_504[9]),pEddgbl->unk_504[9]); - - // D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; - //DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks3 : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks3),pEddgbl->d3dNtHalCallbacks3); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_544 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_544), pEddgbl->unk_544); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_548 : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_548), pEddgbl->unk_548); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[0] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[0]),pEddgbl->unk_54c[0]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[1] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[1]),pEddgbl->unk_54c[1]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[2] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[2]),pEddgbl->unk_54c[2]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[3] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[3]),pEddgbl->unk_54c[3]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[4] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[4]),pEddgbl->unk_54c[4]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[5] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[5]),pEddgbl->unk_54c[5]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[6] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[6]),pEddgbl->unk_54c[6]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[7] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[7]),pEddgbl->unk_54c[7]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[8] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[8]),pEddgbl->unk_54c[8]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[9] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[9]),pEddgbl->unk_54c[9]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[10] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[10]),pEddgbl->unk_54c[10]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[11] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[11]),pEddgbl->unk_54c[11]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[12] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[12]),pEddgbl->unk_54c[12]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[13] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[13]),pEddgbl->unk_54c[13]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[14] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[14]),pEddgbl->unk_54c[14]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[15] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[15]),pEddgbl->unk_54c[15]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[16] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[16]),pEddgbl->unk_54c[16]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[17] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[17]),pEddgbl->unk_54c[17]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[18] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[18]),pEddgbl->unk_54c[18]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[19] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[19]),pEddgbl->unk_54c[19]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[20] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[20]),pEddgbl->unk_54c[20]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[21] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[21]),pEddgbl->unk_54c[21]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_54c[22] : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, unk_54c[22]),pEddgbl->unk_54c[22]); + DPRINT1("0x%08lx 0x504 PEDD_DIRECTDRAW_GLOBAL->ddNtCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddNtCallbacks.dwSize),pEddgbl->ddNtCallbacks.dwSize); + DPRINT1("0x%08lx 0x518 PEDD_DIRECTDRAW_GLOBAL->ddColorControlCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddColorControlCallbacks.dwSize),pEddgbl->ddColorControlCallbacks.dwSize); + DPRINT1("0x%08lx 0x524 PEDD_DIRECTDRAW_GLOBAL->ddKernelCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddKernelCallbacks.dwSize),pEddgbl->ddKernelCallbacks.dwSize); + DPRINT1("0x%08lx 0x534 PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks3.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, d3dNtHalCallbacks3.dwSize),pEddgbl->d3dNtHalCallbacks3.dwSize); + + DPRINT1("0x%08lx 0x54C PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.dwSize),pEddgbl->ddMotionCompCallbacks.dwSize); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.dwFlags : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.dwFlags),pEddgbl->ddMotionCompCallbacks.dwSize); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.GetMoCompGuids : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.GetMoCompGuids),pEddgbl->ddMotionCompCallbacks.GetMoCompGuids); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.GetMoCompFormats : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.GetMoCompFormats),pEddgbl->ddMotionCompCallbacks.GetMoCompFormats); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.CreateMoComp : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.CreateMoComp),pEddgbl->ddMotionCompCallbacks.CreateMoComp); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.GetMoCompBuffInfo : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.GetMoCompBuffInfo),pEddgbl->ddMotionCompCallbacks.GetMoCompBuffInfo); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.GetInternalMoCompInfo : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.GetInternalMoCompInfo),pEddgbl->ddMotionCompCallbacks.GetInternalMoCompInfo); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.BeginMoCompFrame : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.BeginMoCompFrame),pEddgbl->ddMotionCompCallbacks.BeginMoCompFrame); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.EndMoCompFrame : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.EndMoCompFrame),pEddgbl->ddMotionCompCallbacks.EndMoCompFrame); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.RenderMoComp : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.RenderMoComp),pEddgbl->ddMotionCompCallbacks.RenderMoComp); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.QueryMoCompStatus : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.QueryMoCompStatus),pEddgbl->ddMotionCompCallbacks.QueryMoCompStatus); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMotionCompCallbacks.DestroyMoComp : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMotionCompCallbacks.DestroyMoComp),pEddgbl->ddMotionCompCallbacks.DestroyMoComp); + + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->ddMoreSurfaceCaps.dwSize : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, ddMoreSurfaceCaps.dwSize),pEddgbl->ddMoreSurfaceCaps.dwSize); + // EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; DPRINT1("0x%08lx 0x5A8 PEDD_DIRECTDRAW_GLOBAL->peDirectDrawLocalList : 0x%p\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, peDirectDrawLocalList), pEddgbl->peDirectDrawLocalList); // EDD_SURFACE* peSurface_LockList;

7 years, 8 months

[hbelusca] 74136: [COMCTL32]: comctl32/propsheet: Diverse UI fixes: - Draw static text elements with a transparent background, so that they acquire the correct background color of the wizard window...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 9 20:30:16 2017 New Revision: 74136 URL: http://svn.reactos.org/svn/reactos?rev=74136&view=rev Log: [COMCTL32]: comctl32/propsheet: Diverse UI fixes: - Draw static text elements with a transparent background, so that they acquire the correct background color of the wizard window. - Modify the check for the header bitmap, as the header's hbmHeader is initialized also if the flag PSH_HEADER but not PSH_USEHBMHEADER is set (see function PROPSHEET_LoadWizardBitmaps). - Add a check for header's hbmWatermark so that the watermark is drawn only when a valid bitmap handle is present. - Fix a copy-pasta error when drawing the header's subtitle. CORE-12912 #comment Patch for the wizard visual problem sent upstream. CORE-12823 Modified: trunk/reactos/dll/win32/comctl32/propsheet.c Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Thu Mar 9 20:30:16 2017 @@ -1176,8 +1176,13 @@ return TRUE; case WM_CTLCOLORSTATIC: +#ifdef __REACTOS__ + SetBkMode((HDC)wParam, TRANSPARENT); + return (INT_PTR)GetStockObject(HOLLOW_BRUSH); +#else SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); +#endif } return DefSubclassProc(hwnd, uMsg, wParam, lParam); @@ -3281,7 +3286,11 @@ hOldFont = SelectObject(hdc, psInfo->hFontBold); +#ifdef __REACTOS__ + if (psInfo->ppshheader.u5.hbmHeader) +#else if (psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER) +#endif { hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); @@ -3356,7 +3365,11 @@ if (ppshpage->dwFlags & PSP_USEHEADERSUBTITLE) { SelectObject(hdc, psInfo->hFont); SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom); +#ifdef __REACTOS__ + if (!IS_INTRESOURCE(ppshpage->pszHeaderSubTitle)) +#else if (!IS_INTRESOURCE(ppshpage->pszHeaderTitle)) +#endif DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_WORDBREAK); else { @@ -3378,7 +3391,12 @@ if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && +#ifdef __REACTOS__ + (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && + (psInfo->ppshheader.u4.hbmWatermark) ) +#else (psInfo->ppshheader.dwFlags & PSH_WATERMARK) ) +#endif { HWND hwndLine = GetDlgItem(hwnd, IDC_SUNKEN_LINE);

7 years, 8 months

[hbelusca] 74135: [i8042prt]: Add yet another Dell Latitude hack, (for D810 this time). These Dell laptops undeniably have a peculiar init way that our driver doesn't support naturally. CORE-12899

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 9 16:43:25 2017 New Revision: 74135 URL: http://svn.reactos.org/svn/reactos?rev=74135&view=rev Log: [i8042prt]: Add yet another Dell Latitude hack, (for D810 this time). These Dell laptops undeniably have a peculiar init way that our driver doesn't support naturally. CORE-12899 Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwh… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Thu Mar 9 16:43:25 2017 @@ -65,6 +65,7 @@ { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D600 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D620 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D630 "}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D810 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4300 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4310 "}}, FL_INITHACK },

7 years, 8 months

[hbelusca] 74134: [NETSHELL][SYSSETUP]: Enlarge a bit the height of the setup wizard pages, to not have the bottom text cropped. Fixes the appearance of them when being run from Windows.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 9 16:39:43 2017 New Revision: 74134 URL: http://svn.reactos.org/svn/reactos?rev=74134&view=rev Log: [NETSHELL][SYSSETUP]: Enlarge a bit the height of the setup wizard pages, to not have the bottom text cropped. Fixes the appearance of them when being run from Windows. Modified: trunk/reactos/dll/shellext/netshell/lang/bg-BG.rc trunk/reactos/dll/shellext/netshell/lang/cs-CZ.rc trunk/reactos/dll/shellext/netshell/lang/da-DK.rc trunk/reactos/dll/shellext/netshell/lang/de-DE.rc trunk/reactos/dll/shellext/netshell/lang/el-GR.rc trunk/reactos/dll/shellext/netshell/lang/en-US.rc trunk/reactos/dll/shellext/netshell/lang/es-ES.rc trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc trunk/reactos/dll/shellext/netshell/lang/he-IL.rc trunk/reactos/dll/shellext/netshell/lang/hu-HU.rc trunk/reactos/dll/shellext/netshell/lang/id-ID.rc trunk/reactos/dll/shellext/netshell/lang/it-IT.rc trunk/reactos/dll/shellext/netshell/lang/ja-JP.rc trunk/reactos/dll/shellext/netshell/lang/nl-NL.rc trunk/reactos/dll/shellext/netshell/lang/no-NO.rc trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc trunk/reactos/dll/shellext/netshell/lang/sk-SK.rc trunk/reactos/dll/shellext/netshell/lang/sq-AL.rc trunk/reactos/dll/shellext/netshell/lang/sv-SE.rc trunk/reactos/dll/shellext/netshell/lang/tr-TR.rc trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/da-DK.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/he-IL.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc trunk/reactos/dll/win32/syssetup/lang/th-TH.rc trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/shellext/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… Modified: trunk/reactos/dll/win32/syssetup/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/da… Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… Modified: trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fi… Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… Modified: trunk/reactos/dll/win32/syssetup/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/he… Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… Modified: trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/lt… Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… Modified: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pt… Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… Modified: trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sq… Modified: trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sv… Modified: trunk/reactos/dll/win32/syssetup/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/th… Modified: trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/tr… Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… Modified: trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh…

7 years, 8 months

[hbelusca] 74133: [CLT-2017]: The very last sync! [SHUTDOWN]: shutdown -t causes crash. Patch by Michael Fritscher. (r74131 by Eric). <@dreimer> OMG!!!! <@hbelusca> hm dreimer? <@dreimer> ITS SO IM...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 8 22:34:01 2017 New Revision: 74133 URL: http://svn.reactos.org/svn/reactos?rev=74133&view=rev Log: [CLT-2017]: The very last sync! [SHUTDOWN]: shutdown -t causes crash. Patch by Michael Fritscher. (r74131 by Eric). <@dreimer> OMG!!!! <@hbelusca> hm dreimer? <@dreimer> ITS SO IMPORTANT!!!! <@hbelusca> ah you want it? <@hbelusca> ok <@hbelusca> let's add it :D <@dreimer> jkjkjk Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/shutdown/shutdown.c Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 8 22:34:01 2017 @@ -24,4 +24,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:74083,74112,74117-74119 +/trunk/reactos:74083,74112,74117-74119,74131 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] Wed Mar 8 22:34:01 2017 @@ -56,12 +56,11 @@ break; case L'c': /* Comment on reason for shutdown */ + if (index+1 > argc) + return ERROR_INVALID_DATA; if(CheckCommentLength(argv[index+1])) { - if (index+1 <= argc) - pOpts->message = argv[index+1]; - else - return ERROR_INVALID_DATA; + pOpts->message = argv[index+1]; index++; } else @@ -72,10 +71,9 @@ break; case L'd': /* Reason code [p|u:]xx:yy */ - if (index+1 <= argc) - pOpts->reason = ParseReasonCode(argv[index+1]); - else + if (index+1 >= argc) return ERROR_INVALID_DATA; + pOpts->reason = ParseReasonCode(argv[index+1]); index++; break; @@ -101,7 +99,10 @@ break; case L'm': /* Target remote systems (UNC name/IP address) */ + if (index+1 >= argc) + return ERROR_INVALID_DATA; pOpts->remote_system = argv[index+1]; + index++; break; case L'p': /* Turn off local computer with no warning/time-out */ @@ -118,9 +119,12 @@ break; case L't': /* Shutdown delay */ + if (index+1 >= argc) + return ERROR_INVALID_DATA; pOpts->shutdown_delay = _wtoi(argv[index+1]); if (pOpts->shutdown_delay > 0) pOpts->force = TRUE; + index++; break; default:

7 years, 8 months

[ekohl] 74132: [NTOS:OB] Replace calls to ExFreePool by calls to ExFreePoolWithTag.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Mar 8 22:27:06 2017 New Revision: 74132 URL: http://svn.reactos.org/svn/reactos?rev=74132&view=rev Log: [NTOS:OB] Replace calls to ExFreePool by calls to ExFreePoolWithTag. Modified: trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Wed Mar 8 22:27:06 2017 @@ -126,7 +126,7 @@ &Defaulted); if (NT_SUCCESS(Status) && Dacl != NULL) { - ExFreePool(Dacl); + ExFreePoolWithTag(Dacl, TAG_OB_DIR_SD); } } Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Wed Mar 8 22:27:06 2017 @@ -123,7 +123,7 @@ &Defaulted); if (NT_SUCCESS(Status) && Dacl != NULL) { - ExFreePool(Dacl); + ExFreePoolWithTag(Dacl, TAG_OB_DIR_SD); } }

7 years, 8 months

[ekohl] 74131: [SHUTDOWN] shutdown -t causes crash Patch by Michael Fritscher. CORE-12886 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Mar 8 22:22:21 2017 New Revision: 74131 URL: http://svn.reactos.org/svn/reactos?rev=74131&view=rev Log: [SHUTDOWN] shutdown -t causes crash Patch by Michael Fritscher. CORE-12886 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/shutdown/shutdown.c Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] Wed Mar 8 22:22:21 2017 @@ -56,12 +56,11 @@ break; case L'c': /* Comment on reason for shutdown */ + if (index+1 > argc) + return ERROR_INVALID_DATA; if(CheckCommentLength(argv[index+1])) { - if (index+1 <= argc) - pOpts->message = argv[index+1]; - else - return ERROR_INVALID_DATA; + pOpts->message = argv[index+1]; index++; } else @@ -72,10 +71,9 @@ break; case L'd': /* Reason code [p|u:]xx:yy */ - if (index+1 <= argc) - pOpts->reason = ParseReasonCode(argv[index+1]); - else + if (index+1 >= argc) return ERROR_INVALID_DATA; + pOpts->reason = ParseReasonCode(argv[index+1]); index++; break; @@ -101,7 +99,10 @@ break; case L'm': /* Target remote systems (UNC name/IP address) */ + if (index+1 >= argc) + return ERROR_INVALID_DATA; pOpts->remote_system = argv[index+1]; + index++; break; case L'p': /* Turn off local computer with no warning/time-out */ @@ -118,9 +119,12 @@ break; case L't': /* Shutdown delay */ + if (index+1 >= argc) + return ERROR_INVALID_DATA; pOpts->shutdown_delay = _wtoi(argv[index+1]); if (pOpts->shutdown_delay > 0) pOpts->force = TRUE; + index++; break; default:

7 years, 8 months

[hbelusca] 74130: [CLT-2017]: Add the lstrlenA/W fixes from r74117, r74118, r74119.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 8 22:22:13 2017 New Revision: 74130 URL: http://svn.reactos.org/svn/reactos?rev=74130&view=rev Log: [CLT-2017]: Add the lstrlenA/W fixes from r74117,r74118,r74119. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/kernel32/winnls/string/lstring.c branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/ndk/rtlfuncs.h branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/psdk/winbase.h Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 8 22:22:13 2017 @@ -24,4 +24,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:74083,74112 +/trunk/reactos:74083,74112,74117-74119 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/kernel32/winnls/string/lstring.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/kernel32/winnls/string/lstring.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/dll/win32/kernel32/winnls/string/lstring.c [iso-8859-1] Wed Mar 8 22:22:13 2017 @@ -27,7 +27,8 @@ return 1; Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1); - if (Result) Result -= 2; + if (Result) + Result -= 2; return Result; } @@ -55,6 +56,7 @@ return Result; } + /* * @implemented @@ -144,6 +146,9 @@ { INT Ret = 0; + if (lpString == NULL) + return 0; + _SEH2_TRY { Ret = strlen(lpString); @@ -292,6 +297,9 @@ { INT Ret = 0; + if (lpString == NULL) + return 0; + _SEH2_TRY { Ret = wcslen(lpString); Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Wed Mar 8 22:22:13 2017 @@ -619,6 +619,42 @@ _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler ); +NTSYSAPI +ULONG +NTAPI +RtlRemoveVectoredExceptionHandler( + _In_ PVOID VectoredHandlerHandle +); + +NTSYSAPI +PVOID +NTAPI +RtlAddVectoredContinueHandler( + _In_ ULONG FirstHandler, + _In_ PVECTORED_EXCEPTION_HANDLER VectoredHandler +); + +NTSYSAPI +ULONG +NTAPI +RtlRemoveVectoredContinueHandler( + _In_ PVOID VectoredHandlerHandle +); + +NTSYSAPI +VOID +NTAPI +RtlSetUnhandledExceptionFilter( + _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter +); + +NTSYSAPI +LONG +NTAPI +RtlUnhandledExceptionFilter( + _In_ struct _EXCEPTION_POINTERS* ExceptionInfo +); + __analysis_noreturn NTSYSAPI VOID @@ -628,20 +664,6 @@ _In_ PVOID FileName, _In_ ULONG LineNumber, _In_opt_z_ PCHAR Message -); - -NTSYSAPI -VOID -NTAPI -RtlSetUnhandledExceptionFilter( - _In_ PRTLP_UNHANDLED_EXCEPTION_FILTER TopLevelExceptionFilter -); - -NTSYSAPI -LONG -NTAPI -RtlUnhandledExceptionFilter( - _In_ struct _EXCEPTION_POINTERS* ExceptionInfo ); NTSYSAPI Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/psdk/winbase.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/psdk/winbase.h [iso-8859-1] Wed Mar 8 22:22:13 2017 @@ -1467,6 +1467,7 @@ #endif #if (_WIN32_WINNT >= 0x0500) _Ret_maybenull_ PVOID WINAPI AddVectoredExceptionHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); +_Ret_maybenull_ PVOID WINAPI AddVectoredContinueHandler(_In_ ULONG, _In_ PVECTORED_EXCEPTION_HANDLER); #endif BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD); @@ -2882,6 +2883,7 @@ BOOL WINAPI RemoveDirectoryW(LPCWSTR); #if (_WIN32_WINNT >= 0x0500) ULONG WINAPI RemoveVectoredExceptionHandler(_In_ PVOID); +ULONG WINAPI RemoveVectoredContinueHandler(_In_ PVOID); #endif #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI ReplaceFileA(_In_ LPCSTR, _In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD, _Reserved_ LPVOID, _Reserved_ LPVOID);

7 years, 8 months

[hbelusca] 74129: [CLT-2017]: For this 0.4.4 release, let's play safe & revert the USB stack import from r73605, as the latter need more real-hardware testing & fixes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 8 22:20:11 2017 New Revision: 74129 URL: http://svn.reactos.org/svn/reactos?rev=74129&view=rev Log: [CLT-2017]: For this 0.4.4 release, let's play safe & revert the USB stack import from r73605, as the latter need more real-hardware testing & fixes. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/drivers/hid/hidparse/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/drivers/hid/hidparse/hidparse.c branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/ (props changed) branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/CMakeLists.txt branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/fdo.c branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/misc.c branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/pdo.c branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/usbhub.c branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/usbhub.h branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/context.c branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/hidparser.c branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/parser.c branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/libusb/hub_controller.cpp (contents, props changed) Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 8 22:20:11 2017 @@ -2,7 +2,7 @@ /branches/GSoC_2011/GSoC_TcpIpDriver:51550 /branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 /branches/GSoC_2016/AHCI:71203-73603 -/branches/GSoC_2016/USB:72365-73604 +/branches/GSoC_2016/USB:72366,72376 /branches/GSoC_Network:51545-51546 /branches/cmake-bringup:50484,50693,50719,51544-52564 /branches/colins-printing-for-freedom/reactos:67543-68405,68407-68414,68417-70595 Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/hid/hidparse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 8 22:20:11 2017 @@ -1,7 +1,6 @@ /branches/GSoC_2011/GSoC_Network/drivers/hid/hidparse:51548 /branches/GSoC_2011/GSoC_TcpIpDriver/drivers/hid/hidparse:51550 /branches/GSoC_2011/TcpIpDriver/drivers/hid/hidparse:51551-53074,53076-53119 -/branches/GSoC_2016/USB/drivers/hid/hidparse:72365-73604 /branches/GSoC_Network/drivers/hid/hidparse:51545-51546 /branches/cmake-bringup/drivers/hid/hidparse:50484,50693,50719,51544-52564 /branches/condrv_restructure/drivers/hid/hidparse:63104-64101 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/hid/hidparse/hidparse.c [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -126,29 +126,6 @@ } NTSTATUS -TranslateStatusForUpperLayer( - IN HIDPARSER_STATUS Status) -{ - // - // now we are handling only this values, for others just return - // status as it is. - // - switch (Status) - { - case HIDPARSER_STATUS_INSUFFICIENT_RESOURCES: - return STATUS_INSUFFICIENT_RESOURCES; - case HIDPARSER_STATUS_INVALID_REPORT_TYPE: - return HIDP_STATUS_INVALID_REPORT_TYPE; - case HIDPARSER_STATUS_BUFFER_TOO_SMALL: - return STATUS_BUFFER_TOO_SMALL; - case HIDPARSER_STATUS_COLLECTION_NOT_FOUND: - return STATUS_NO_DATA_DETECTED; - default: - return Status; - } -} - -NTSTATUS NTAPI HidP_GetCollectionDescription( IN PHIDP_REPORT_DESCRIPTOR ReportDesc, @@ -157,7 +134,6 @@ OUT PHIDP_DEVICE_DESC DeviceDescription) { HID_PARSER Parser; - NTSTATUS Status; // // init parser @@ -167,8 +143,7 @@ // // get description; // - Status = HidParser_GetCollectionDescription(&Parser, ReportDesc, DescLength, PoolType, DeviceDescription); - return TranslateStatusForUpperLayer(Status); + return HidParser_GetCollectionDescription(&Parser, ReportDesc, DescLength, PoolType, DeviceDescription); } HIDAPI Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 8 22:20:11 2017 @@ -4,7 +4,7 @@ /branches/GSoC_2011/GSoC_TcpIpDriver/drivers/usb/usbhub_new:51550 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbhub:51551-53074,53076-53119 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbhub_new:51551-53074,53076-53119 -/branches/GSoC_2016/USB/drivers/usb/usbhub:72365-73604 +/branches/GSoC_2016/USB/drivers/usb/usbhub:72366,72376 /branches/GSoC_Network/drivers/usb/usbhub:51545-51546 /branches/GSoC_Network/drivers/usb/usbhub_new:51545-51546 /branches/cmake-bringup/drivers/usb/usbhub:50484,50693,50719,51544-52564 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -1,6 +1,5 @@ add_definitions(-DDEBUG_MODE) -add_definitions(-DNTDDI_VERSION=0x05020400) include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) list(APPEND SOURCE Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -568,11 +568,6 @@ Stack->Parameters.QueryInterface.Version = Version; Stack->Parameters.QueryInterface.Interface = Interface; Stack->Parameters.QueryInterface.InterfaceSpecificData = NULL; - - // - // Initialize the status block before sending the IRP - // - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Status = IoCallDriver(DeviceObject, Irp); @@ -1094,7 +1089,8 @@ PDEVICE_OBJECT ChildDeviceObject = NULL; ULONG Index = 0; - KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); + DPRINT("Removing device on port %d (Child index: %d)\n", PortId, Index); + for (Index = 0; Index < USB_MAXCHILDREN; Index++) { if (HubDeviceExtension->ChildDeviceObject[Index]) @@ -1115,16 +1111,11 @@ if (!ChildDeviceObject) { DPRINT1("Removal request for non-existant device!\n"); - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); return STATUS_UNSUCCESSFUL; } - - DPRINT("Removing device on port %d (Child index: %d)\n", PortId, Index); /* Remove the device from the table */ HubDeviceExtension->ChildDeviceObject[Index] = NULL; - - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); /* Invalidate device relations for the root hub */ IoInvalidateDeviceRelations(HubDeviceExtension->RootHubPhysicalDeviceObject, BusRelations); @@ -1156,6 +1147,26 @@ HubInterface = &HubDeviceExtension->HubInterface; RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; HubInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext; + // + // Find an empty slot in the child device array + // + for (ChildDeviceCount = 0; ChildDeviceCount < USB_MAXCHILDREN; ChildDeviceCount++) + { + if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL) + { + DPRINT("Found unused entry at %d\n", ChildDeviceCount); + break; + } + } + + // + // Check if the limit has been reached for maximum usb devices + // + if (ChildDeviceCount == USB_MAXCHILDREN) + { + DPRINT1("USBHUB: Too many child devices!\n"); + return STATUS_UNSUCCESSFUL; + } while (TRUE) { @@ -1215,6 +1226,10 @@ UsbChildExtension->ParentDeviceObject = UsbHubDeviceObject; UsbChildExtension->PortNumber = PortId; + // copy device interface + RtlCopyMemory(&UsbChildExtension->DeviceInterface, &HubDeviceExtension->DeviceInterface, sizeof(USB_BUS_INTERFACE_USBDI_V2)); + + // // Create the UsbDeviceObject // @@ -1228,6 +1243,12 @@ DPRINT1("USBHUB: CreateUsbDevice failed with status %x\n", Status); goto Cleanup; } + + // copy device interface + RtlCopyMemory(&UsbChildExtension->DeviceInterface, &HubDeviceExtension->DeviceInterface, sizeof(USB_BUS_INTERFACE_USBDI_V2)); + + // FIXME replace buscontext + UsbChildExtension->DeviceInterface.BusContext = UsbChildExtension->UsbDeviceHandle; // // Initialize UsbDevice @@ -1318,43 +1339,8 @@ goto Cleanup; } - // copy device interface - RtlCopyMemory(&UsbChildExtension->DeviceInterface, &HubDeviceExtension->UsbDInterface, sizeof(USB_BUS_INTERFACE_USBDI_V2)); - UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); - - INITIALIZE_PNP_STATE(UsbChildExtension->Common); - - IoInitializeRemoveLock(&UsbChildExtension->Common.RemoveLock, 'pbuH', 0, 0); - - KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); - - // - // Find an empty slot in the child device array - // - for (ChildDeviceCount = 0; ChildDeviceCount < USB_MAXCHILDREN; ChildDeviceCount++) - { - if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL) - { - DPRINT("Found unused entry at %d\n", ChildDeviceCount); - break; - } - } - - // - // Check if the limit has been reached for maximum usb devices - // - if (ChildDeviceCount == USB_MAXCHILDREN) - { - DPRINT1("USBHUB: Too many child devices!\n"); - Status = STATUS_UNSUCCESSFUL; - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); - UsbChildExtension->DeviceInterface.InterfaceDereference(UsbChildExtension->DeviceInterface.BusContext); - goto Cleanup; - } - HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] = NewChildDeviceObject; HubDeviceExtension->InstanceCount++; - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); IoInvalidateDeviceRelations(RootHubDeviceObject, BusRelations); return STATUS_SUCCESS; @@ -1398,20 +1384,16 @@ NTSTATUS USBHUB_FdoQueryBusRelations( IN PDEVICE_OBJECT DeviceObject, - IN PDEVICE_RELATIONS RelationsFromTop, OUT PDEVICE_RELATIONS* pDeviceRelations) { PHUB_DEVICE_EXTENSION HubDeviceExtension; PDEVICE_RELATIONS DeviceRelations; ULONG i; - ULONG ChildrenFromTop = 0; ULONG Children = 0; ULONG NeededSize; HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); - // // Count the number of children // @@ -1425,19 +1407,9 @@ Children++; } - if (RelationsFromTop) - { - ChildrenFromTop = RelationsFromTop->Count; - if (!Children) - { - // We have nothing to add - *pDeviceRelations = RelationsFromTop; - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); - return STATUS_SUCCESS; - } - } - - NeededSize = sizeof(DEVICE_RELATIONS) + (Children + ChildrenFromTop - 1) * sizeof(PDEVICE_OBJECT); + NeededSize = sizeof(DEVICE_RELATIONS); + if (Children > 1) + NeededSize += (Children - 1) * sizeof(PDEVICE_OBJECT); // // Allocate DeviceRelations @@ -1446,22 +1418,9 @@ NeededSize); if (!DeviceRelations) - { - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); - if (!RelationsFromTop) - return STATUS_INSUFFICIENT_RESOURCES; - else - return STATUS_NOT_SUPPORTED; - } - // Copy the objects coming from top - if (ChildrenFromTop) - { - RtlCopyMemory(DeviceRelations->Objects, RelationsFromTop->Objects, - ChildrenFromTop * sizeof(PDEVICE_OBJECT)); - } - - DeviceRelations->Count = Children + ChildrenFromTop; - Children = ChildrenFromTop; + return STATUS_INSUFFICIENT_RESOURCES; + DeviceRelations->Count = Children; + Children = 0; // // Fill in return structure @@ -1470,18 +1429,11 @@ { if (HubDeviceExtension->ChildDeviceObject[i]) { - // The PnP Manager removes the reference when appropriate. ObReferenceObject(HubDeviceExtension->ChildDeviceObject[i]); HubDeviceExtension->ChildDeviceObject[i]->Flags &= ~DO_DEVICE_INITIALIZING; DeviceRelations->Objects[Children++] = HubDeviceExtension->ChildDeviceObject[i]; } } - - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); - - // We should do this, because replaced this with our's one - if (RelationsFromTop) - ExFreePool(RelationsFromTop); ASSERT(Children == DeviceRelations->Count); *pDeviceRelations = DeviceRelations; @@ -1599,8 +1551,7 @@ if (!Urb) { // no memory - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; + return STATUS_INSUFFICIENT_RESOURCES; } // zero urb @@ -1615,7 +1566,8 @@ { // failed to obtain hub pdo DPRINT1("IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO failed with %x\n", Status); - goto cleanup; + ExFreePool(Urb); + return Status; } // sanity checks @@ -1626,13 +1578,14 @@ RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; // Send the StartDevice to RootHub - Status = ForwardIrpAndWait(HubDeviceExtension->LowerDeviceObject, Irp); + Status = ForwardIrpAndWait(RootHubDeviceObject, Irp); if (!NT_SUCCESS(Status)) { // failed to start pdo DPRINT1("Failed to start the RootHub PDO\n"); - goto cleanup; + ExFreePool(Urb); + return Status; } // Get the current number of hubs @@ -1643,7 +1596,8 @@ { // failed to get number of hubs DPRINT1("IOCTL_INTERNAL_USB_GET_HUB_COUNT failed with %x\n", Status); - goto cleanup; + ExFreePool(Urb); + return Status; } // Get the Hub Interface @@ -1657,7 +1611,8 @@ { // failed to get root hub interface DPRINT1("Failed to get HUB_GUID interface with status 0x%08lx\n", Status); - goto cleanup; + ExFreePool(Urb); + return Status; } HubInterfaceBusContext = HubDeviceExtension->HubInterface.BusContext; @@ -1673,7 +1628,8 @@ { // failed to get usbdi interface DPRINT1("Failed to get USBDI_GUID interface with status 0x%08lx\n", Status); - goto cleanup; + ExFreePool(Urb); + return Status; } // Get Root Hub Device Handle @@ -1686,7 +1642,8 @@ { // failed DPRINT1("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE failed with status 0x%08lx\n", Status); - goto cleanup; + ExFreePool(Urb); + return Status; } // @@ -1730,7 +1687,8 @@ { // failed to get device descriptor of hub DPRINT1("Failed to get HubDeviceDescriptor!\n"); - goto cleanup; + ExFreePool(Urb); + return Status; } // build configuration request @@ -1757,7 +1715,8 @@ { // failed to get configuration descriptor DPRINT1("Failed to get RootHub Configuration with status %x\n", Status); - goto cleanup; + ExFreePool(Urb); + return Status; } // sanity checks @@ -1783,15 +1742,16 @@ { // failed to get hub information DPRINT1("Failed to extended hub information. Unable to determine the number of ports!\n"); - goto cleanup; + ExFreePool(Urb); + return Status; } if (!HubDeviceExtension->UsbExtHubInfo.NumberOfPorts) { // bogus port driver DPRINT1("Failed to retrieve the number of ports\n"); - Status = STATUS_UNSUCCESSFUL; - goto cleanup; + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; } DPRINT("HubDeviceExtension->UsbExtHubInfo.NumberOfPorts %x\n", HubDeviceExtension->UsbExtHubInfo.NumberOfPorts); @@ -1822,8 +1782,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get Hub Descriptor!\n"); - Status = STATUS_UNSUCCESSFUL; - goto cleanup; + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; } // sanity checks @@ -1851,21 +1811,14 @@ { // failed to get hub status DPRINT1("Failed to get Hub Status!\n"); - Status = STATUS_UNSUCCESSFUL; - goto cleanup; + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; } // Allocate memory for PortStatusChange to hold 2 USHORTs for each port on hub HubDeviceExtension->PortStatusChange = ExAllocatePoolWithTag(NonPagedPool, sizeof(ULONG) * HubDeviceExtension->UsbExtHubInfo.NumberOfPorts, USB_HUB_TAG); - - if (!HubDeviceExtension->PortStatusChange) - { - DPRINT1("Failed to allocate pool for PortStatusChange!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } // Get the first Configuration Descriptor Pid = USBD_ParseConfigurationDescriptorEx(&HubDeviceExtension->HubConfigDescriptor, @@ -1875,8 +1828,8 @@ { // failed parse hub descriptor DPRINT1("Failed to parse configuration descriptor\n"); - Status = STATUS_UNSUCCESSFUL; - goto cleanup; + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; } // create configuration request @@ -1887,8 +1840,8 @@ { // failed to build urb DPRINT1("Failed to allocate urb\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; + ExFreePool(Urb); + return STATUS_INSUFFICIENT_RESOURCES; } // send request @@ -1900,7 +1853,9 @@ { // failed to select configuration DPRINT1("Failed to select configuration with %x\n", Status); - goto cleanup; + ExFreePool(Urb); + ExFreePool(ConfigUrb); + return Status; } // store configuration & pipe handle @@ -1908,6 +1863,12 @@ HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; DPRINT("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); + FDO_QueryInterface(DeviceObject, &HubDeviceExtension->DeviceInterface); + + + // free urb + ExFreePool(ConfigUrb); + // check if function is available if (HubDeviceExtension->UsbDInterface.IsDeviceHighSpeed) { @@ -1947,7 +1908,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to set callback\n"); - goto cleanup; + ExFreePool(Urb); + return Status; } } else @@ -1999,29 +1961,7 @@ // free urb ExFreePool(Urb); - // free ConfigUrb - ExFreePool(ConfigUrb); - // done - return Status; - -cleanup: - if (Urb) - ExFreePool(Urb); - - // Dereference interfaces - if (HubDeviceExtension->HubInterface.Size) - HubDeviceExtension->HubInterface.InterfaceDereference(HubDeviceExtension->HubInterface.BusContext); - - if (HubDeviceExtension->UsbDInterface.Size) - HubDeviceExtension->UsbDInterface.InterfaceDereference(HubDeviceExtension->UsbDInterface.BusContext); - - if (HubDeviceExtension->PortStatusChange) - ExFreePool(HubDeviceExtension->PortStatusChange); - - if (ConfigUrb) - ExFreePool(ConfigUrb); - return Status; } @@ -2032,31 +1972,17 @@ { PIO_STACK_LOCATION Stack; NTSTATUS Status = STATUS_SUCCESS; - PDEVICE_OBJECT ChildDeviceObject; + ULONG_PTR Information = 0; PHUB_DEVICE_EXTENSION HubDeviceExtension; - PUSB_BUS_INTERFACE_HUB_V5 HubInterface; - PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; - HubInterface = &HubDeviceExtension->HubInterface; Stack = IoGetCurrentIrpStackLocation(Irp); - Status = IoAcquireRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - switch (Stack->MinorFunction) { - int i; - case IRP_MN_START_DEVICE: { - DPRINT("IRP_MN_START_DEVICE\n"); if (USBHUB_IsRootHubFDO(DeviceObject)) { // start root hub fdo @@ -2066,13 +1992,7 @@ { Status = USBHUB_ParentFDOStartDevice(DeviceObject, Irp); } - - SET_NEW_PNP_STATE(HubDeviceExtension->Common, Started); - - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); - return Status; + break; } case IRP_MN_QUERY_DEVICE_RELATIONS: @@ -2082,197 +2002,66 @@ case BusRelations: { PDEVICE_RELATIONS DeviceRelations = NULL; - PDEVICE_RELATIONS RelationsFromTop = (PDEVICE_RELATIONS)Irp->IoStatus.Information; DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); - Status = USBHUB_FdoQueryBusRelations(DeviceObject, RelationsFromTop, &DeviceRelations); - - if (!NT_SUCCESS(Status)) - { - if (Status == STATUS_NOT_SUPPORTED) - { - // We should process this to not lose relations from top. - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - } - // We should fail an IRP - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); - return Status; - } - - Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; - Irp->IoStatus.Status = Status; + Status = USBHUB_FdoQueryBusRelations(DeviceObject, &DeviceRelations); + + Information = (ULONG_PTR)DeviceRelations; break; } case RemovalRelations: { DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); - break; + return ForwardIrpAndForget(DeviceObject, Irp); } default: DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); - break; + return ForwardIrpAndForget(DeviceObject, Irp); } break; } + case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { - // - // We should fail this request, because we're not handling - // IRP_MN_STOP_DEVICE for now.We'll receive this IRP ONLY when - // PnP manager rebalances resources. - // - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Status = STATUS_SUCCESS; + return ForwardIrpAndForget(DeviceObject, Irp); + } + case IRP_MN_REMOVE_DEVICE: + { + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; - } - case IRP_MN_QUERY_REMOVE_DEVICE: - { - // No action is required from FDO because it have nothing to free. - DPRINT("IRP_MN_QUERY_REMOVE_DEVICE\n"); - - SET_NEW_PNP_STATE(HubDeviceExtension->Common, RemovePending); - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - } - case IRP_MN_CANCEL_REMOVE_DEVICE: - { - DPRINT("IRP_MN_CANCEL_REMOVE_DEVICE\n"); - - if (HubDeviceExtension->Common.PnPState == RemovePending) - RESTORE_PREVIOUS_PNP_STATE(HubDeviceExtension->Common); - - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - } - case IRP_MN_SURPRISE_REMOVAL: - { - // - // We'll receive this IRP on HUB unexpected removal, or on USB - // controller removal from PCI port. Here we should "let know" all - // our children that their parent is removed and on next removal - // they also can be removed. - // - SET_NEW_PNP_STATE(HubDeviceExtension->Common, SurpriseRemovePending); - - KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); - - for (i = 0; i < USB_MAXCHILDREN; i++) - { - ChildDeviceObject = HubDeviceExtension->ChildDeviceObject[i]; - if (ChildDeviceObject) - { - ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)ChildDeviceObject->DeviceObjectExtension; - ChildDeviceExtension->ParentDeviceObject = NULL; - } - } - - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); - - // This IRP can't be failed - Irp->IoStatus.Status = STATUS_SUCCESS; - break; - } - case IRP_MN_REMOVE_DEVICE: - { - DPRINT("IRP_MN_REMOVE_DEVICE\n"); - - SET_NEW_PNP_STATE(HubDeviceExtension->Common, Deleted); - - IoReleaseRemoveLockAndWait(&HubDeviceExtension->Common.RemoveLock, Irp); - - // - // Here we should remove all child PDOs. At this point all children - // received and returned from IRP_MN_REMOVE so remove synchronization - // isn't needed here - // - - KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); - - for (i = 0; i < USB_MAXCHILDREN; i++) - { - ChildDeviceObject = HubDeviceExtension->ChildDeviceObject[i]; - if (ChildDeviceObject) - { - PHUB_CHILDDEVICE_EXTENSION UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)ChildDeviceObject->DeviceExtension; - - SET_NEW_PNP_STATE(UsbChildExtension->Common, Deleted); - - // Remove the usb device - if (UsbChildExtension->UsbDeviceHandle) - { - Status = HubInterface->RemoveUsbDevice(HubInterface->BusContext, UsbChildExtension->UsbDeviceHandle, 0); - ASSERT(Status == STATUS_SUCCESS); - } - - // Free full configuration descriptor - if (UsbChildExtension->FullConfigDesc) - ExFreePool(UsbChildExtension->FullConfigDesc); - - // Free ID buffers - if (UsbChildExtension->usCompatibleIds.Buffer) - ExFreePool(UsbChildExtension->usCompatibleIds.Buffer); - - if (UsbChildExtension->usDeviceId.Buffer) - ExFreePool(UsbChildExtension->usDeviceId.Buffer); - - if (UsbChildExtension->usHardwareIds.Buffer) - ExFreePool(UsbChildExtension->usHardwareIds.Buffer); - - if (UsbChildExtension->usInstanceId.Buffer) - ExFreePool(UsbChildExtension->usInstanceId.Buffer); - - DPRINT("Deleting child PDO\n"); - IoDeleteDevice(DeviceObject); - ChildDeviceObject = NULL; - } - } - - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Status = ForwardIrpAndForget(DeviceObject, Irp); IoDetachDevice(HubDeviceExtension->LowerDeviceObject); - DPRINT("Deleting FDO 0x%p\n", DeviceObject); IoDeleteDevice(DeviceObject); - return Status; + return STATUS_SUCCESS; } case IRP_MN_QUERY_BUS_INFORMATION: { - // Function drivers and filter drivers do not handle this IRP. DPRINT("IRP_MN_QUERY_BUS_INFORMATION\n"); break; } case IRP_MN_QUERY_ID: { DPRINT("IRP_MN_QUERY_ID\n"); - // Function drivers and filter drivers do not handle this IRP. break; } case IRP_MN_QUERY_CAPABILITIES: { - // - // If a function or filter driver does not handle this IRP, it - // should pass that down. - // DPRINT("IRP_MN_QUERY_CAPABILITIES\n"); break; } default: { DPRINT(" IRP_MJ_PNP / unknown minor function 0x%lx\n", Stack->MinorFunction); - break; - } - } - - Status = ForwardIrpAndForget(DeviceObject, Irp); - IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); + return ForwardIrpAndForget(DeviceObject, Irp); + } + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -2297,25 +2086,6 @@ // get device extension HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; - Status = IoAcquireRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - // Prevent handling of control requests in remove pending state - if (HubDeviceExtension->Common.PnPState == RemovePending) - { - DPRINT1("[USBHUB] Request for removed device object %p\n", DeviceObject); - Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); - return STATUS_DEVICE_NOT_CONNECTED; - } - if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_INFORMATION) { // is the buffer big enough @@ -2361,7 +2131,6 @@ // sanity checks ASSERT(NodeConnectionInfo); - KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); for(Index = 0; Index < USB_MAXCHILDREN; Index++) { if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) @@ -2388,7 +2157,6 @@ } break; } - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); // done Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); Status = STATUS_SUCCESS; @@ -2409,7 +2177,6 @@ // sanity checks ASSERT(NodeKey); - KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); for(Index = 0; Index < USB_MAXCHILDREN; Index++) { if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) @@ -2449,7 +2216,6 @@ NodeKey->ActualLength = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); break; } - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); } } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_NAME) @@ -2481,7 +2247,6 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); return Status; } Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -211,3 +211,84 @@ return Status; } + +NTSTATUS +NTAPI +FDO_QueryInterfaceCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + /* Set event */ + KeSetEvent((PRKEVENT)Context, 0, FALSE); + + /* Completion is done in the HidClassFDO_QueryCapabilities routine */ + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +FDO_QueryInterface( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PUSB_BUS_INTERFACE_USBDI_V2 Interface) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + + /* Get device extension */ + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(HubDeviceExtension->Common.IsFDO); + + /* Init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Now allocate the irp */ + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + /* No memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* Init stack location */ + IoStack->MajorFunction = IRP_MJ_PNP; + IoStack->MinorFunction = IRP_MN_QUERY_INTERFACE; + IoStack->Parameters.QueryInterface.Interface = (PINTERFACE)Interface; + IoStack->Parameters.QueryInterface.InterfaceType = &USB_BUS_INTERFACE_USBDI_GUID; + IoStack->Parameters.QueryInterface.Version = USB_BUSIF_USBDI_VERSION_2; + IoStack->Parameters.QueryInterface.Size = sizeof(USB_BUS_INTERFACE_USBDI_V2); + + + /* Set completion routine */ + IoSetCompletionRoutine(Irp, + FDO_QueryInterfaceCompletionRoutine, + (PVOID)&Event, + TRUE, + TRUE, + TRUE); + + /* Pnp irps have default completion code */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + /* Call lower device */ + Status = IoCallDriver(HubDeviceExtension->LowerDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + /* Get status */ + Status = Irp->IoStatus.Status; + + /* Complete request */ + IoFreeIrp(Irp); + + /* Done */ + return Status; +} Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -146,25 +146,16 @@ ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); - - // This can happen when parent device was surprise removed. - if (ChildDeviceExtension->ParentDeviceObject == NULL) - return FALSE; - HubDeviceExtension = (PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension; - KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); for(Index = 0; Index < USB_MAXCHILDREN; Index++) { if (HubDeviceExtension->ChildDeviceObject[Index] == DeviceObject) { - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); - /* PDO exists */ return TRUE; } } - KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); /* invalid pdo */ return FALSE; @@ -199,30 +190,17 @@ ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); - - Status = IoAcquireRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - if (ChildDeviceExtension->Common.PnPState == SurpriseRemovePending || - ChildDeviceExtension->Common.PnPState == RemovePending || - ChildDeviceExtension->ParentDeviceObject == NULL) - { - // Parent or child device was surprise removed. + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension; + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; + + if(!IsValidPDO(DeviceObject)) + { DPRINT1("[USBHUB] Request for removed device object %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - IoReleaseRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); return STATUS_DEVICE_NOT_CONNECTED; } - - HubDeviceExtension = (PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension; - RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; switch (Stack->Parameters.DeviceIoControl.IoControlCode) { @@ -323,7 +301,6 @@ // Send the request to RootHub // Status = ForwardUrbToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Irp, Urb, NULL); - IoReleaseRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); return Status; } // @@ -420,7 +397,6 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); } - IoReleaseRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); return Status; } @@ -444,8 +420,6 @@ // IoRegisterDeviceInterface(DeviceObject, &GUID_DEVINTERFACE_USB_DEVICE, NULL, &ChildDeviceExtension->SymbolicLinkName); IoSetDeviceInterfaceState(&ChildDeviceExtension->SymbolicLinkName, TRUE); - - SET_NEW_PNP_STATE(ChildDeviceExtension->Common, Started); UNIMPLEMENTED; return STATUS_SUCCESS; @@ -589,19 +563,14 @@ PIO_STACK_LOCATION Stack; ULONG_PTR Information = 0; PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; + ULONG Index; + ULONG bFound; PDEVICE_RELATIONS DeviceRelation; + PDEVICE_OBJECT ParentDevice; UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); MinorFunction = Stack->MinorFunction; - - Status = IoAcquireRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } switch (MinorFunction) { @@ -659,20 +628,17 @@ } case IRP_MN_QUERY_DEVICE_TEXT: { - DPRINT("IRP_MN_QUERY_DEVICE_TEXT\n"); Status = USBHUB_PdoQueryDeviceText(DeviceObject, Irp, &Information); break; } case IRP_MN_QUERY_ID: { - DPRINT("IRP_MN_QUERY_ID\n"); Status = USBHUB_PdoQueryId(DeviceObject, Irp, &Information); break; } case IRP_MN_QUERY_BUS_INFORMATION: { PPNP_BUS_INFORMATION BusInfo; - DPRINT("IRP_MN_QUERY_BUS_INFORMATION\n"); BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION)); RtlCopyMemory(&BusInfo->BusTypeGuid, &GUID_BUS_TYPE_USB, @@ -688,58 +654,42 @@ { PHUB_DEVICE_EXTENSION HubDeviceExtension = (PHUB_DEVICE_EXTENSION)UsbChildExtension->ParentDeviceObject->DeviceExtension; PUSB_BUS_INTERFACE_HUB_V5 HubInterface = &HubDeviceExtension->HubInterface; + ParentDevice = UsbChildExtension->ParentDeviceObject; DPRINT("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); - ASSERT((UsbChildExtension->Common.PnPState == RemovePending) || - (UsbChildExtension->Common.PnPState == SurpriseRemovePending)); - - SET_NEW_PNP_STATE(UsbChildExtension->Common, NotStarted); - - if (!IsValidPDO(DeviceObject)) - { - // Parent or child device was surprise removed, freeing resources allocated for child device. - SET_NEW_PNP_STATE(UsbChildExtension->Common, Deleted); - - IoReleaseRemoveLockAndWait(&UsbChildExtension->Common.RemoveLock, Irp); - - // Remove the usb device - if (UsbChildExtension->UsbDeviceHandle) + /* remove us from pdo list */ + bFound = FALSE; + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == DeviceObject) { - Status = HubInterface->RemoveUsbDevice(HubInterface->BusContext, UsbChildExtension->UsbDeviceHandle, 0); - ASSERT(Status == STATUS_SUCCESS); + /* Remove the device */ + Status = HubInterface->RemoveUsbDevice(HubDeviceExtension->UsbDInterface.BusContext, UsbChildExtension->UsbDeviceHandle, 0); + + /* FIXME handle error */ + ASSERT(Status == STATUS_SUCCESS); + + /* remove us */ + HubDeviceExtension->ChildDeviceObject[Index] = NULL; + bFound = TRUE; + break; } - // Free full configuration descriptor - if (UsbChildExtension->FullConfigDesc) - ExFreePool(UsbChildExtension->FullConfigDesc); - - // Free ID buffers - if (UsbChildExtension->usCompatibleIds.Buffer) - ExFreePool(UsbChildExtension->usCompatibleIds.Buffer); - - if (UsbChildExtension->usDeviceId.Buffer) - ExFreePool(UsbChildExtension->usDeviceId.Buffer); - - if (UsbChildExtension->usHardwareIds.Buffer) - ExFreePool(UsbChildExtension->usHardwareIds.Buffer); - - if (UsbChildExtension->usInstanceId.Buffer) - ExFreePool(UsbChildExtension->usInstanceId.Buffer); - - DPRINT("Deleting child PDO\n"); - IoDeleteDevice(DeviceObject); - } - else - { - IoReleaseRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); - } - - // If device is physically presented, we leave its PDO undeleted. + } /* Complete the IRP */ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); + /* delete device */ + IoDeleteDevice(DeviceObject); + + if (bFound) + { + /* invalidate device relations */ + IoInvalidateDeviceRelations(ParentDevice, BusRelations); + } + return STATUS_SUCCESS; } case IRP_MN_QUERY_DEVICE_RELATIONS: @@ -749,7 +699,6 @@ { /* not supported */ Status = Irp->IoStatus.Status; - Information = Irp->IoStatus.Information; break; } @@ -773,46 +722,13 @@ break; } case IRP_MN_QUERY_STOP_DEVICE: - { - // - // We should fail this request, because we're not handling IRP_MN_STOP_DEVICE for now. - // We'll receive this IRP ONLY when the PnP manager rebalances resources. - // - Status = STATUS_NOT_SUPPORTED; - break; - } case IRP_MN_QUERY_REMOVE_DEVICE: { - // - // Free interface obtained from bottom, according MSDN we should - // check interfaces provided to top, but here we are not checking. - // All checking will be performed in roothub driver's - // IRP_MN_QUERY_REMOVE_DEVICE handler. This will make problems when - // buggy driver is loaded on top of us. But we decided to keep source - // simpler, because in any case buggy driver will prevent removing of - // whole stack. - // - UsbChildExtension->DeviceInterface.InterfaceDereference(UsbChildExtension->DeviceInterface.BusContext); - - SET_NEW_PNP_STATE(UsbChildExtension->Common, RemovePending); - /* Sure, no problem */ Status = STATUS_SUCCESS; Information = 0; break; } - case IRP_MN_CANCEL_REMOVE_DEVICE: - { - // Check to see have we received query-remove before - if (UsbChildExtension->Common.PnPState == RemovePending) - { - RESTORE_PREVIOUS_PNP_STATE(UsbChildExtension->Common); - UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); - } - - Status = STATUS_SUCCESS; - break; - } case IRP_MN_QUERY_INTERFACE: { DPRINT1("IRP_MN_QUERY_INTERFACE\n"); @@ -820,28 +736,17 @@ { DPRINT1("USB_BUS_INTERFACE_USBDI_GUID\n"); RtlCopyMemory(Stack->Parameters.QueryInterface.Interface, &UsbChildExtension->DeviceInterface, Stack->Parameters.QueryInterface.Size); - UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); Status = STATUS_SUCCESS; break; } // pass irp down IoSkipCurrentIrpStackLocation(Irp); - Status = IoCallDriver(UsbChildExtension->ParentDeviceObject, Irp); - IoReleaseRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); - return Status; + return IoCallDriver(UsbChildExtension->ParentDeviceObject, Irp); } case IRP_MN_SURPRISE_REMOVAL: { DPRINT("[USBHUB] HandlePnp IRP_MN_SURPRISE_REMOVAL\n"); - - // - // Here we should free all resources and stop all access, lets just set - // the flag and do further clean-up in subsequent IRP_MN_REMOVE_DEVICE - // We can receive this IRP when device is physically connected (on stop/start fail). - // - SET_NEW_PNP_STATE(UsbChildExtension->Common, SurpriseRemovePending); - Status = STATUS_SUCCESS; break; } @@ -852,8 +757,6 @@ Status = Irp->IoStatus.Status; } } - - IoReleaseRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/usbhub.c [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -62,7 +62,7 @@ PDEVICE_OBJECT DeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; NTSTATUS Status; - DPRINT("USBHUB: AddDevice (%p)\n", PhysicalDeviceObject); + DPRINT("USBHUB: AddDevice\n"); // // Create the Device Object // @@ -86,19 +86,11 @@ HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; RtlZeroMemory(HubDeviceExtension, sizeof(HUB_DEVICE_EXTENSION)); - INITIALIZE_PNP_STATE(HubDeviceExtension->Common); - // // Set this to Fdo // HubDeviceExtension->Common.IsFDO = TRUE; DeviceObject->Flags |= DO_POWER_PAGABLE; - - // initialize mutex - KeInitializeGuardedMutex(&HubDeviceExtension->HubMutexLock); - - // initialize remove lock - IoInitializeRemoveLock(&HubDeviceExtension->Common.RemoveLock, 'buH', 0, 0); // // initialize reset complete event @@ -167,26 +159,14 @@ } NTSTATUS NTAPI -USBHUB_DispatchSystemControl( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - DPRINT("Usbhub: DispatchSystemControl\n"); +USBHUB_DispatchInternalDeviceControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT("Usbhub: DispatchInternalDeviceControl\n"); if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) return USBHUB_IrpStub(DeviceObject, Irp); else - return USBHUB_IrpStub(DeviceObject, Irp); -} - -NTSTATUS NTAPI -USBHUB_DispatchInternalDeviceControl( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - DPRINT("Usbhub: DispatchInternalDeviceControl\n"); - if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) - return USBHUB_IrpStub(DeviceObject, Irp); - else return USBHUB_PdoHandleInternalDeviceControl(DeviceObject, Irp); } @@ -208,59 +188,37 @@ PIRP Irp) { PIO_STACK_LOCATION IoStack; - PHUB_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; + IoStack = IoGetCurrentIrpStackLocation(Irp); - DeviceExtension = DeviceObject->DeviceExtension; - - Status = IoAcquireRemoveLock(&DeviceExtension->Common.RemoveLock, Irp); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Status = Status; + DPRINT1("Power Function %x\n", IoStack->MinorFunction); + + if (IoStack->MinorFunction == IRP_MN_SET_POWER) + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - DPRINT1("Power Function %x\n", IoStack->MinorFunction); - - if (DeviceExtension->Common.IsFDO) + return STATUS_SUCCESS; + + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_POWER) { PoStartNextPowerIrp(Irp); - IoSkipCurrentIrpStackLocation(Irp); - Status = PoCallDriver(DeviceExtension->LowerDeviceObject, Irp); - IoReleaseRemoveLock(&DeviceExtension->Common.RemoveLock, Irp); - return Status; - } - - switch (IoStack->MinorFunction) - { - case IRP_MN_SET_POWER: - { - DPRINT("IRP_MN_SET_POWER\n"); - break; - } - case IRP_MN_QUERY_POWER: - { - DPRINT("IRP_MN_QUERY_POWER\n"); - break; - } - case IRP_MN_WAIT_WAKE: - { - DPRINT("IRP_MN_WAIT_WAKE\n"); - break; - } - default: - { - DPRINT1("PDO IRP_MJ_POWER / unknown minor function 0x%lx\n", IoStack->MinorFunction); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Irp->IoStatus.Status; - } + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + } + else if (IoStack->MinorFunction == IRP_MN_WAIT_WAKE) + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } PoStartNextPowerIrp(Irp); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - IoReleaseRemoveLock(&DeviceExtension->Common.RemoveLock, Irp); return STATUS_SUCCESS; } @@ -287,7 +245,6 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBHUB_Close; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = USBHUB_Cleanup; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBHUB_DispatchDeviceControl; - DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = USBHUB_DispatchSystemControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBHUB_DispatchInternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = USBHUB_DispatchPnp; DriverObject->MajorFunction[IRP_MJ_POWER] =USBHUB_DispatchPower; Modified: branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/d… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -39,43 +39,9 @@ PVOID Context; } WORK_ITEM_DATA, *PWORK_ITEM_DATA; - -// -// Definitions for device's PnP state tracking, all this states are described -// in PnP Device States diagram of DDK documentation. -// -typedef enum _DEVICE_PNP_STATE { - - NotStarted = 0, // Not started - Started, // After handling of START_DEVICE IRP - StopPending, // After handling of QUERY_STOP IRP - Stopped, // After handling of STOP_DEVICE IRP - RemovePending, // After handling of QUERY_REMOVE IRP - SurpriseRemovePending, // After handling of SURPRISE_REMOVE IRP - Deleted, // After handling of REMOVE_DEVICE IRP - UnKnown // Unknown state - -} DEVICE_PNP_STATE; - -#define INITIALIZE_PNP_STATE(Data) \ -(Data).PnPState = NotStarted;\ -(Data).PreviousPnPState = NotStarted; - -#define SET_NEW_PNP_STATE(Data, state) \ -(Data).PreviousPnPState = (Data).PnPState;\ -(Data).PnPState = (state); - -#define RESTORE_PREVIOUS_PNP_STATE(Data) \ -(Data).PnPState = (Data).PreviousPnPState; - typedef struct { BOOLEAN IsFDO; - // We'll track device PnP state via this variables - DEVICE_PNP_STATE PnPState; - DEVICE_PNP_STATE PreviousPnPState; - // Remove lock - IO_REMOVE_LOCK RemoveLock; } COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; typedef struct _HUB_CHILDDEVICE_EXTENSION @@ -106,8 +72,6 @@ PDEVICE_OBJECT RootHubPhysicalDeviceObject; PDEVICE_OBJECT RootHubFunctionalDeviceObject; - KGUARDED_MUTEX HubMutexLock; - ULONG NumberOfHubs; KEVENT ResetComplete; @@ -130,6 +94,7 @@ USBD_CONFIGURATION_HANDLE ConfigurationHandle; USBD_PIPE_HANDLE PipeHandle; PVOID RootHubHandle; + USB_BUS_INTERFACE_USBDI_V2 DeviceInterface; UNICODE_STRING SymbolicLinkName; ULONG InstanceCount; Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/context.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/context.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/context.c [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -163,7 +163,7 @@ // // store offset // - TargetCollection->Offsets[Collection->ReportCount + Index] = CurrentOffset; + TargetCollection->Offsets[Collection->NodeCount + Index] = CurrentOffset; // // store sub collections @@ -254,7 +254,7 @@ // // get collection // - SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->ReportCount + Index]); + SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->NodeCount + Index]); // // recursively search collection @@ -314,7 +314,7 @@ // // get offset to sub collection // - SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->ReportCount + Index]); + SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->NodeCount + Index]); // // count collection for sub nodes Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/hidparser.c [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -68,7 +68,7 @@ // failed to parse report descriptor // Parser->Debug("[HIDPARSER] Failed to parse report descriptor with %x\n", ParserStatus); - return ParserStatus; + return TranslateHidParserStatus(ParserStatus); } // @@ -126,9 +126,7 @@ // // no memory // - Parser->Free(DeviceDescription->CollectionDesc); - Parser->Free(DeviceDescription->ReportIDs); - return ParserStatus; + return TranslateHidParserStatus(ParserStatus); } // @@ -155,13 +153,6 @@ // get collection usage page // ParserStatus = HidParser_GetCollectionUsagePage((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, &DeviceDescription->CollectionDesc[Index].Usage, &DeviceDescription->CollectionDesc[Index].UsagePage); - if (ParserStatus != HIDPARSER_STATUS_SUCCESS) - { - // collection not found - Parser->Free(DeviceDescription->CollectionDesc); - Parser->Free(DeviceDescription->ReportIDs); - return ParserStatus; - } // // windows seems to prepend the report id, regardless if it is required Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/parser.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/parser.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/hidparser/parser.c [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -712,6 +712,30 @@ // return HIDPARSER_STATUS_SUCCESS; } + +HIDPARSER_STATUS +AllocateParserContext( + IN PHID_PARSER Parser, + OUT PHID_PARSER_CONTEXT *OutParserContext) +{ + PHID_PARSER_CONTEXT ParserContext; + + ParserContext = Parser->Alloc(sizeof(HID_PARSER_CONTEXT)); + if (!ParserContext) + { + // + // failed + // + return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; + } + + // + // store result + // + *OutParserContext = ParserContext; + return HIDPARSER_STATUS_SUCCESS; +} + HIDPARSER_STATUS HidParser_ParseReportDescriptor( @@ -736,18 +760,12 @@ PMAIN_ITEM_DATA MainItemData; PHID_PARSER_CONTEXT ParserContext; - CurrentOffset = ReportDescriptor; - ReportEnd = ReportDescriptor + ReportLength; - - if (ReportDescriptor >= ReportEnd) - return HIDPARSER_STATUS_COLLECTION_NOT_FOUND; - // // allocate parser // - ParserContext = Parser->Alloc(sizeof(HID_PARSER_CONTEXT));; - if (!ParserContext) - return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; + Status = AllocateParserContext(Parser, &ParserContext); + if (Status != HIDPARSER_STATUS_SUCCESS) + return Status; // @@ -760,7 +778,6 @@ // // no memory // - Parser->Free(ParserContext); return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; } @@ -775,7 +792,6 @@ // Parser->Free(ParserContext->LocalItemState.UsageStack); ParserContext->LocalItemState.UsageStack = NULL; - Parser->Free(ParserContext); return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; } @@ -783,6 +799,8 @@ // start parsing // CurrentCollection = ParserContext->RootCollection; + CurrentOffset = ReportDescriptor; + ReportEnd = ReportDescriptor + ReportLength; do { @@ -1212,7 +1230,8 @@ // CurrentOffset += CurrentItemSize + sizeof(ITEM_PREFIX); - }while (CurrentOffset < ReportEnd); + + }while(CurrentOffset < ReportEnd); // Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Wed Mar 8 22:20:11 2017 @@ -568,8 +568,7 @@ break; } } - // Here we should leave Status as is. - Status = Irp->IoStatus.Status; + Status = STATUS_SUCCESS; break; } case IRP_MN_QUERY_CAPABILITIES: @@ -612,14 +611,6 @@ // handle device interface requests // Status = HandleQueryInterface(IoStack); - - // - // If a bus driver does not export the requested interface, it - // should leave Status as is. - // - if (Status == STATUS_NOT_SUPPORTED) - Status = Irp->IoStatus.Status; - break; } case IRP_MN_REMOVE_DEVICE: @@ -3745,7 +3736,6 @@ InterfaceHub->SetDeviceHandleData = USBHI_SetDeviceHandleData; } - InterfaceHub->InterfaceReference(InterfaceHub->BusContext); // // request completed // @@ -3800,7 +3790,6 @@ InterfaceDI->EnumLogEntry = USBDI_EnumLogEntry; } - InterfaceDI->InterfaceReference(InterfaceDI->BusContext); // // request completed // Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/lib/drivers/libusb/hub_controller.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 8 22:20:11 2017 @@ -4,7 +4,6 @@ /branches/GSoC_2011/GSoC_TcpIpDriver/drivers/usb/usbehci_new/hub_controller.cpp:51550 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbehci/hub_controller.cpp:51551-53074,53076-53119 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbehci_new/hub_controller.cpp:51551-53074,53076-53119 -/branches/GSoC_2016/USB/sdk/lib/drivers/libusb/hub_controller.cpp:72365-73604 /branches/GSoC_Network/drivers/usb/usbehci/hub_controller.cpp:51545-51546 /branches/GSoC_Network/drivers/usb/usbehci_new/hub_controller.cpp:51545-51546 /branches/cmake-bringup/drivers/usb/usbehci/hub_controller.cpp:50484,50693,50719,51544-52564

7 years, 8 months

[gadamopoulos] 74128: [UXTHEME_APITEST] -Add a test to show that CloseThemeData doesn't use exception handling.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Mar 8 15:15:19 2017 New Revision: 74128 URL: http://svn.reactos.org/svn/reactos?rev=74128&view=rev Log: [UXTHEME_APITEST] -Add a test to show that CloseThemeData doesn't use exception handling. Added: trunk/rostests/apitests/uxtheme/CloseThemeData.c (with props) Modified: trunk/rostests/apitests/uxtheme/CMakeLists.txt trunk/rostests/apitests/uxtheme/testlist.c Modified: trunk/rostests/apitests/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/CMakeLis… ============================================================================== --- trunk/rostests/apitests/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/uxtheme/CMakeLists.txt [iso-8859-1] Wed Mar 8 15:15:19 2017 @@ -1,5 +1,6 @@ list(APPEND SOURCE + CloseThemeData.c DrawThemeParentBackground.c ../include/msgtrace.c testlist.c) Added: trunk/rostests/apitests/uxtheme/CloseThemeData.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/CloseThe… ============================================================================== --- trunk/rostests/apitests/uxtheme/CloseThemeData.c (added) +++ trunk/rostests/apitests/uxtheme/CloseThemeData.c [iso-8859-1] Wed Mar 8 15:15:19 2017 @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for CloseThemeData + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <apitest.h> +#include <stdio.h> +#include <windows.h> +#include <uxtheme.h> + +static LONG WINAPI VEHandler(PEXCEPTION_POINTERS ExceptionInfo) +{ + ok(FALSE, "VEHandler called!\n"); + return EXCEPTION_CONTINUE_SEARCH; +} + +START_TEST(CloseThemeData) +{ + PVOID pVEH; + HRESULT hr; + + pVEH = AddVectoredExceptionHandler(1, VEHandler); + + hr = CloseThemeData((HTHEME)0xdeaddead); + ok( hr == E_HANDLE, "Expected E_HANDLE, got 0x%lx\n", hr); + + RemoveVectoredExceptionHandler(pVEH); +} Propchange: trunk/rostests/apitests/uxtheme/CloseThemeData.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/uxtheme/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/testlist… ============================================================================== --- trunk/rostests/apitests/uxtheme/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/uxtheme/testlist.c [iso-8859-1] Wed Mar 8 15:15:19 2017 @@ -4,9 +4,11 @@ #include <apitest.h> extern void func_DrawThemeParentBackground(void); +extern void func_CloseThemeData(void); const struct test winetest_testlist[] = { { "DrawThemeParentBackground", func_DrawThemeParentBackground }, + { "CloseThemeData", func_CloseThemeData }, { 0, 0 } };

7 years, 8 months

← Newer
1
...
10
11
12
13
14
15
16
...
26
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 March 2017